* [PATCH 0/2 V2] staging: r8712u: Fix two regressions
@ 2012-02-26 0:10 Larry Finger
2012-02-26 0:10 ` [PATCH 2/2 V2] staging: r8712u: Fix regression caused by commit 8c213fa Larry Finger
0 siblings, 1 reply; 2+ messages in thread
From: Larry Finger @ 2012-02-26 0:10 UTC (permalink / raw)
To: gregkh; +Cc: Larry Finger, linux-kernel, devel
This patch set fixes regressions introduced in kernel 3.2.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
V2 - Improved commit message as requested
- Fixed the Tested-by lines
Larry Finger (2):
staging: r8712u: Fix regression introduced by commit a5ee652
staging: r8712u: Fix regression caused by commit 8c213fa
drivers/staging/rtl8712/os_intfs.c | 5 -----
drivers/staging/rtl8712/usb_intf.c | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
--
1.7.7
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2 V2] staging: r8712u: Fix regression caused by commit 8c213fa
2012-02-26 0:10 [PATCH 0/2 V2] staging: r8712u: Fix two regressions Larry Finger
@ 2012-02-26 0:10 ` Larry Finger
0 siblings, 0 replies; 2+ messages in thread
From: Larry Finger @ 2012-02-26 0:10 UTC (permalink / raw)
To: gregkh; +Cc: Larry Finger, linux-kernel, devel
In commit 8c213fa "staging: r8712u: Use asynchronous firmware loading",
the command to release the firmware was placed in the wrong routine.
In combination with the bug introduced in commit a5ee652 "staging: r8712u:
Interface-state not fully tracked", the driver attempts to upload firmware
that had already been released. This bug is the source of one of the
problems in https://bugs.archlinux.org/task/27996#comment89833.
Tested-by: Alberto Lago Ballesteros <saniukeokusainaya@gmail.com>
Tested-by: Adrian <agib@gmx.de>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
drivers/staging/rtl8712/os_intfs.c | 3 ---
drivers/staging/rtl8712/usb_intf.c | 5 +++++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index 4cf175f..7bbd53a 100644
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/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/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index fe0e2ff..e01fe14 100644
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/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)
--
1.7.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-26 0:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-26 0:10 [PATCH 0/2 V2] staging: r8712u: Fix two regressions Larry Finger
2012-02-26 0:10 ` [PATCH 2/2 V2] staging: r8712u: Fix regression caused by commit 8c213fa Larry Finger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).