Commit 1d73fad8 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman

staging: r8712u: Remove needless test for NULL

In commit ee6aeff7, a swatch warning was fixed by moving some code inside
an if block that is executed only when the pointer padapter is not NULL.
In fact, padapter can never be NULL and the corect fix should have been
the removal of the test of padapter.
Reported-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d4172cd
...@@ -621,25 +621,23 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf) ...@@ -621,25 +621,23 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)
struct usb_device *udev = interface_to_usbdev(pusb_intf); struct usb_device *udev = interface_to_usbdev(pusb_intf);
usb_set_intfdata(pusb_intf, NULL); usb_set_intfdata(pusb_intf, NULL);
if (padapter) { if (padapter->fw_found)
if (padapter->fw_found) release_firmware(padapter->fw);
release_firmware(padapter->fw); /* never exit with a firmware callback pending */
/* never exit with a firmware callback pending */ wait_for_completion(&padapter->rtl8712_fw_ready);
wait_for_completion(&padapter->rtl8712_fw_ready); if (drvpriv.drv_registered == true)
if (drvpriv.drv_registered == true) padapter->bSurpriseRemoved = true;
padapter->bSurpriseRemoved = true; if (pnetdev != NULL) {
if (pnetdev != NULL) { /* will call netdev_close() */
/* will call netdev_close() */ unregister_netdev(pnetdev);
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);
} }
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); usb_set_intfdata(pusb_intf, NULL);
/* decrease the reference count of the usb device structure /* decrease the reference count of the usb device structure
* when disconnect */ * when disconnect */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment