From: Johan Hovold Date: Mon, 26 May 2014 17:23:02 +0000 (+0200) Subject: USB: sierra: remove disconnected test from close X-Git-Tag: MMI-PSA29.97-13-9~11772^2~37^2~129 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=40d88983cee801cb9aef00e514b3ebf3a51f6c7e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Greg Kroah-Hartman --- 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)