From 073d500d0724a0bc74015a3e7265fdfd22e967f3 Mon Sep 17 00:00:00 2001
From: Paul Fox <pgf@laptop.org>
Date: Wed, 13 Oct 2010 20:14:56 +0100
Subject: [PATCH] --- yaml --- r: 215357 b: refs/heads/master c:
 4f329c043ba3495f0f97ec782948cbba7bd01047 h: refs/heads/master i:   215355:
 ddb73c9a37e8af8f250ffae1c7129a6f611664fd v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/libertas/if_usb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index da42ea47d33b..985a78f5f013 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4659912b557e9f68c0ad8be14e2cafd3210dd16
+refs/heads/master: 4f329c043ba3495f0f97ec782948cbba7bd01047
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c
index 238de10a4b57..b70f0f490118 100644
--- a/trunk/drivers/net/wireless/libertas/if_usb.c
+++ b/trunk/drivers/net/wireless/libertas/if_usb.c
@@ -484,11 +484,12 @@ static int if_usb_reset_device(struct if_usb_card *cardp)
  */
 static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload, uint16_t nb)
 {
-	int ret = -1;
+	int ret;
 
 	/* check if device is removed */
 	if (cardp->surprise_removed) {
 		lbs_deb_usbd(&cardp->udev->dev, "Device removed\n");
+		ret = -ENODEV;
 		goto tx_ret;
 	}
 
@@ -501,7 +502,6 @@ static int usb_tx_block(struct if_usb_card *cardp, uint8_t *payload, uint16_t nb
 
 	if ((ret = usb_submit_urb(cardp->tx_urb, GFP_ATOMIC))) {
 		lbs_deb_usbd(&cardp->udev->dev, "usb_submit_urb failed: %d\n", ret);
-		ret = -1;
 	} else {
 		lbs_deb_usb2(&cardp->udev->dev, "usb_submit_urb success\n");
 		ret = 0;