From ae479f43c13627cb6473445a89bd41b2044bf68d Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Wed, 25 Feb 2009 00:35:44 +0000
Subject: [PATCH] --- yaml --- r: 134762 b: refs/heads/master c:
 ce030edfb4ba6734248b8d9f98d0a6f1dcd142e7 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/can/af_can.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d3a814113f35..65c520dcdfba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91744f6559393697e13bf0f9f3f35f884e2520f9
+refs/heads/master: ce030edfb4ba6734248b8d9f98d0a6f1dcd142e7
diff --git a/trunk/net/can/af_can.c b/trunk/net/can/af_can.c
index d90e8dd975fc..547bafc79e28 100644
--- a/trunk/net/can/af_can.c
+++ b/trunk/net/can/af_can.c
@@ -273,8 +273,7 @@ int can_send(struct sk_buff *skb, int loop)
 		err = net_xmit_errno(err);
 
 	if (err) {
-		if (newskb)
-			kfree_skb(newskb);
+		kfree_skb(newskb);
 		return err;
 	}