USB: sierra: 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>

1 files changed, 17 insertions, 22 deletions

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index c13f6e747748..2b06481dc85c 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -778,30 +778,25 @@ static void sierra_close(struct usb_serial_port *port)
         portdata->rts_state = 0;
         portdata->dtr_state = 0;
 
-        if (serial->dev) {
-                mutex_lock(&serial->disc_mutex);
-                if (!serial->disconnected) {
-                        serial->interface->needs_remote_wakeup = 0;
-                        /* odd error handling due to pm counters */
-                        if (!usb_autopm_get_interface(serial->interface))
-                                sierra_send_setup(port);
-                        else
-                                usb_autopm_get_interface_no_resume(serial->interface);
-                                
-                }
-                mutex_unlock(&serial->disc_mutex);
-                spin_lock_irq(&intfdata->susp_lock);
-                portdata->opened = 0;
-                spin_unlock_irq(&intfdata->susp_lock);
+        mutex_lock(&serial->disc_mutex);
+        if (!serial->disconnected) {
+                serial->interface->needs_remote_wakeup = 0;
+                /* odd error handling due to pm counters */
+                if (!usb_autopm_get_interface(serial->interface))
+                        sierra_send_setup(port);
+                else
+                        usb_autopm_get_interface_no_resume(serial->interface);
 
+        }
+        mutex_unlock(&serial->disc_mutex);
+        spin_lock_irq(&intfdata->susp_lock);
+        portdata->opened = 0;
+        spin_unlock_irq(&intfdata->susp_lock);
 
-                /* Stop reading urbs */
-                sierra_stop_rx_urbs(port);
-                /* .. and release them */
-                for (i = 0; i < portdata->num_in_urbs; i++) {
-                        sierra_release_urb(portdata->in_urbs[i]);
-                        portdata->in_urbs[i] = NULL;
-                }
+        sierra_stop_rx_urbs(port);
+        for (i = 0; i < portdata->num_in_urbs; i++) {
+                sierra_release_urb(portdata->in_urbs[i]);
+                portdata->in_urbs[i] = NULL;
         }
 }