Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/rtl8712/usb_intf.c

+16 −18
Original line number Diff line number Diff line
@@ -621,7 +621,6 @@ 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 */
@@ -639,7 +638,6 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf) 
		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 */