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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 571965aa1cc015257eaf4bde8316ce10045a82a0..ece326ef63a0b64c831e5f541b7171b95a9761f6 100644 (file)
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -421,20 +421,19 @@ void usb_wwan_close(struct usb_serial_port *port)
 
        portdata = usb_get_serial_port_data(port);
 
-       if (serial->dev) {
-               /* Stop reading/writing urbs */
-               spin_lock_irq(&intfdata->susp_lock);
-               portdata->opened = 0;
-               spin_unlock_irq(&intfdata->susp_lock);
+       /* Stop reading/writing urbs */
+       spin_lock_irq(&intfdata->susp_lock);
+       portdata->opened = 0;
+       spin_unlock_irq(&intfdata->susp_lock);
 
-               for (i = 0; i < N_IN_URB; i++)
-                       usb_kill_urb(portdata->in_urbs[i]);
-               for (i = 0; i < N_OUT_URB; i++)
-                       usb_kill_urb(portdata->out_urbs[i]);
-               /* balancing - important as an error cannot be handled*/
-               usb_autopm_get_interface_no_resume(serial->interface);
-               serial->interface->needs_remote_wakeup = 0;
-       }
+       for (i = 0; i < N_IN_URB; i++)
+               usb_kill_urb(portdata->in_urbs[i]);
+       for (i = 0; i < N_OUT_URB; i++)
+               usb_kill_urb(portdata->out_urbs[i]);
+
+       /* balancing - important as an error cannot be handled*/
+       usb_autopm_get_interface_no_resume(serial->interface);
+       serial->interface->needs_remote_wakeup = 0;
 }
 EXPORT_SYMBOL(usb_wwan_close);