Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[linux-2.6-omap-h63xx.git] / net / can / af_can.c

diff --git a/net/can/af_can.c b/net/can/af_can.c
index d90e8dd975fcf05d842be52fd41ef8e1f369d411..547bafc79e28585c44f5d59b46c9884ec1d414da 100644 (file)
--- a/net/can/af_can.c
+++ b/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;
        }