Re: [ 166/167] [PATCH] staging: r8712u: Fix regression caused bycommit 8c213fa

From: Larry Finger
Date: Fri May 11 2012 - 12:28:14 EST


On 05/10/2012 10:21 PM, Ben Hutchings wrote:
On Wed, 2012-05-09 at 12:49 -0700, Herton Ronaldo Krzesinski wrote:
On Wed, May 09, 2012 at 06:53:15AM +0100, Ben Hutchings wrote:
3.2-stable review patch. If anyone has any objections, please let me know.

------------------

From: Larry Finger<Larry.Finger@xxxxxxxxxxxx>

commit 2080913e017ab9f88379d93fd09546ad95faf87b upstream.
[...]
--- 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);

We also need to apply commit ee6aeff71e2f16b9fe95ce908d098c169e0f4004
after this, due to the possible invalid padapter dereference.
[...]

That 'fix' makes no sense since netdev_priv() never returns NULL.

Larry, you should remove the test for pAdapter completely, or if pnetdev
can somehow be NULL then test *that*.

Thanks. I have a patch under testing.

Larry

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/