From f124ee37ca661a40fa54b1465da0516e62bc31ac Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 11 May 2012 11:33:43 -0500 Subject: [PATCH] --- yaml --- r: 304663 b: refs/heads/master c: 1d73fad8335784fa53349ed2c5284c1339e3b103 h: refs/heads/master i: 304661: 3c9f29a6fab59a6ef1567b6771786c1074ea5649 304659: 5b0448fc2d39673aca1cb1b675ace2bfe2e0d1e7 304655: 6eeb1c4952fbec0f65b50c5b50c898134ca4c087 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8712/usb_intf.c | 34 +++++++++++------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 1b867b31262c..6e0cc21167d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d4172cd63bd7a70007ce9d4d1fb48953323c328 +refs/heads/master: 1d73fad8335784fa53349ed2c5284c1339e3b103 diff --git a/trunk/drivers/staging/rtl8712/usb_intf.c b/trunk/drivers/staging/rtl8712/usb_intf.c index a0de043305de..9bd18e2d0513 100644 --- a/trunk/drivers/staging/rtl8712/usb_intf.c +++ b/trunk/drivers/staging/rtl8712/usb_intf.c @@ -621,25 +621,23 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf) struct usb_device *udev = interface_to_usbdev(pusb_intf); 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) { - /* will call netdev_close() */ - unregister_netdev(pnetdev); - } - flush_scheduled_work(); - udelay(1); - /*Stop driver mlme relation timer */ - if (padapter->fw_found) - r8712_stop_drv_timers(padapter); - r871x_dev_unload(padapter); - r8712_free_drv_sw(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) { + /* will call netdev_close() */ + unregister_netdev(pnetdev); } + flush_scheduled_work(); + udelay(1); + /*Stop driver mlme relation timer */ + if (padapter->fw_found) + r8712_stop_drv_timers(padapter); + r871x_dev_unload(padapter); + r8712_free_drv_sw(padapter); usb_set_intfdata(pusb_intf, NULL); /* decrease the reference count of the usb device structure * when disconnect */