From 34ba001121a7aa1c498986e20df825bedea60c83 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Sat, 25 Feb 2012 18:10:21 -0600
Subject: [PATCH] --- yaml --- r: 289171 b: refs/heads/master c:
 2080913e017ab9f88379d93fd09546ad95faf87b h: refs/heads/master i:   289169:
 941676bb562fd70028708b7b1b4e639dc11b04ce   289167:
 912bd829696ae2b33502b0e98b2d6598b0a8ea26 v: v3

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

diff --git a/[refs] b/[refs]
index 3e20bd03e0f5..21549e3af323 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f4bc8cf3fe750ed093856a5f5d41c11cc12ad22
+refs/heads/master: 2080913e017ab9f88379d93fd09546ad95faf87b
diff --git a/trunk/drivers/staging/rtl8712/os_intfs.c b/trunk/drivers/staging/rtl8712/os_intfs.c
index 4cf175f53f9e..7bbd53a410e3 100644
--- a/trunk/drivers/staging/rtl8712/os_intfs.c
+++ b/trunk/drivers/staging/rtl8712/os_intfs.c
@@ -475,9 +475,6 @@ static int netdev_close(struct net_device *pnetdev)
 	r8712_free_assoc_resources(padapter);
 	/*s2-4.*/
 	r8712_free_network_queue(padapter);
-	release_firmware(padapter->fw);
-	/* never exit with a firmware callback pending */
-	wait_for_completion(&padapter->rtl8712_fw_ready);
 	return 0;
 }
 
diff --git a/trunk/drivers/staging/rtl8712/usb_intf.c b/trunk/drivers/staging/rtl8712/usb_intf.c
index fe0e2ffc5250..e01fe1419d1c 100644
--- a/trunk/drivers/staging/rtl8712/usb_intf.c
+++ b/trunk/drivers/staging/rtl8712/usb_intf.c
@@ -30,6 +30,7 @@
 
 #include <linux/usb.h>
 #include <linux/module.h>
+#include <linux/firmware.h>
 
 #include "osdep_service.h"
 #include "drv_types.h"
@@ -620,6 +621,10 @@ 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 (drvpriv.drv_registered == true)