diff options
| author |   Johan Hovold <jhovold@gmail.com> | 2014-05-26 19:23:02 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 15:04:04 -0700 |
| commit | 40d88983cee801cb9aef00e514b3ebf3a51f6c7e (patch) | |
| tree | 812d09d5b4cda1d0d168056f9e5e457024553a8d /drivers/usb/serial | |
| parent | USB: sierra: remove unimplemented set_termios (diff) | |
| download | linux-dev-40d88983cee801cb9aef00e514b3ebf3a51f6c7e.tar.xz linux-dev-40d88983cee801cb9aef00e514b3ebf3a51f6c7e.zip | |
USB: sierra: remove disconnected test from close
Remove no longer needed disconnected test from close, which is never
called post disconnect (and drivers must handle failed I/O during
disconnect anyway).
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/sierra.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 854ac61581ba..74b417c91e30 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c @@ -772,16 +772,12 @@ static void sierra_close(struct usb_serial_port *port) portdata->rts_state = 0; portdata->dtr_state = 0; - mutex_lock(&serial->disc_mutex); - if (!serial->disconnected) { - /* 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); + /* 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; if (--intfdata->open_ports == 0) |