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

Commit e6d144bc authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: usb_wwan: remove bogus disconnect test in close 



Remove bogus (and unnecessary) test for serial->dev being NULL in close.

The device is never cleared, and close is never called after a completed
disconnect anyway.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c210bfa

drivers/usb/serial/usb_wwan.c

+12 −13
Original line number Original line Diff line number Diff line
@@ -421,7 +421,6 @@ void usb_wwan_close(struct usb_serial_port *port) 




	portdata = usb_get_serial_port_data(port);

	portdata = usb_get_serial_port_data(port);





	if (serial->dev) {

	/* Stop reading/writing urbs */

	/* Stop reading/writing urbs */

	spin_lock_irq(&intfdata->susp_lock);

	spin_lock_irq(&intfdata->susp_lock);

	portdata->opened = 0;

	portdata->opened = 0;
@@ -431,11 +430,11 @@ void usb_wwan_close(struct usb_serial_port *port) 
		usb_kill_urb(portdata->in_urbs[i]);

		usb_kill_urb(portdata->in_urbs[i]);

	for (i = 0; i < N_OUT_URB; i++)

	for (i = 0; i < N_OUT_URB; i++)

		usb_kill_urb(portdata->out_urbs[i]);

		usb_kill_urb(portdata->out_urbs[i]);



	/* balancing - important as an error cannot be handled*/

	/* balancing - important as an error cannot be handled*/

	usb_autopm_get_interface_no_resume(serial->interface);

	usb_autopm_get_interface_no_resume(serial->interface);

	serial->interface->needs_remote_wakeup = 0;

	serial->interface->needs_remote_wakeup = 0;

}

}

}

EXPORT_SYMBOL(usb_wwan_close);

EXPORT_SYMBOL(usb_wwan_close);





/* Helper functions used by usb_wwan_setup_urbs */

/* Helper functions used by usb_wwan_setup_urbs */