From aa9f90ad3ddaddb4527a83dc46a4a8b433022374 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 6 Mar 2010 01:11:38 +0000
Subject: [PATCH] --- yaml --- r: 187952 b: refs/heads/master c:
 ea3fb371b2a391958670f2a65e1203f7dba61671 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/can/usb/ems_usb.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 47b2eb377b51..0ea85dc437d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02a780c014c40973cbe71d04cec7a24e6629995f
+refs/heads/master: ea3fb371b2a391958670f2a65e1203f7dba61671
diff --git a/trunk/drivers/net/can/usb/ems_usb.c b/trunk/drivers/net/can/usb/ems_usb.c
index 11c87840cc00..33451092b8e8 100644
--- a/trunk/drivers/net/can/usb/ems_usb.c
+++ b/trunk/drivers/net/can/usb/ems_usb.c
@@ -876,9 +876,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
 	return NETDEV_TX_OK;
 
 nomem:
-	if (skb)
-		dev_kfree_skb(skb);
-
+	dev_kfree_skb(skb);
 	stats->tx_dropped++;
 
 	return NETDEV_TX_OK;