From 30e6dab436903d7fd012002b688616c5fbce8c96 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 2 Mar 2012 21:06:49 -0600
Subject: [PATCH] --- yaml --- r: 289193 b: refs/heads/master c:
 ee6aeff71e2f16b9fe95ce908d098c169e0f4004 h: refs/heads/master i:   289191:
 dc676e8a47273be2385e7c59030ab077300c0659 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/rtl8712/usb_intf.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f979ff25ed1f..98612bb6474d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b76dee4a410c8c2732b2073bf9d280c1d16923ed
+refs/heads/master: ee6aeff71e2f16b9fe95ce908d098c169e0f4004
diff --git a/trunk/drivers/staging/rtl8712/usb_intf.c b/trunk/drivers/staging/rtl8712/usb_intf.c
index b0c4cdba2229..e419b4fd82b9 100644
--- a/trunk/drivers/staging/rtl8712/usb_intf.c
+++ b/trunk/drivers/staging/rtl8712/usb_intf.c
@@ -620,12 +620,12 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)
 	struct _adapter *padapter = netdev_priv(pnetdev);
 	struct usb_device *udev = interface_to_usbdev(pusb_intf);
 
-	if (padapter->fw_found)
-		release_firmware(padapter->fw);
-	/* never exit with a firmware callback pending */
-	wait_for_completion(&padapter->rtl8712_fw_ready);
 	usb_set_intfdata(pusb_intf, NULL);
 	if (padapter) {
+		if (padapter->fw_found)
+			release_firmware(padapter->fw);
+		/* never exit with a firmware callback pending */
+		wait_for_completion(&padapter->rtl8712_fw_ready);
 		if (drvpriv.drv_registered == true)
 			padapter->bSurpriseRemoved = true;
 		if (pnetdev != NULL) {