Commit 9c210bfa authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb3529c6
...@@ -778,30 +778,25 @@ static void sierra_close(struct usb_serial_port *port) ...@@ -778,30 +778,25 @@ static void sierra_close(struct usb_serial_port *port)
portdata->rts_state = 0; portdata->rts_state = 0;
portdata->dtr_state = 0; portdata->dtr_state = 0;
if (serial->dev) { mutex_lock(&serial->disc_mutex);
mutex_lock(&serial->disc_mutex); if (!serial->disconnected) {
if (!serial->disconnected) { serial->interface->needs_remote_wakeup = 0;
serial->interface->needs_remote_wakeup = 0; /* odd error handling due to pm counters */
/* odd error handling due to pm counters */ if (!usb_autopm_get_interface(serial->interface))
if (!usb_autopm_get_interface(serial->interface)) sierra_send_setup(port);
sierra_send_setup(port); else
else usb_autopm_get_interface_no_resume(serial->interface);
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_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);
sierra_stop_rx_urbs(port); for (i = 0; i < portdata->num_in_urbs; i++) {
/* .. and release them */ sierra_release_urb(portdata->in_urbs[i]);
for (i = 0; i < portdata->num_in_urbs; i++) { portdata->in_urbs[i] = NULL;
sierra_release_urb(portdata->in_urbs[i]);
portdata->in_urbs[i] = NULL;
}
} }
} }
......
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