Просмотр исходного кода

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>
Johan Hovold 11 лет назад
Родитель
Сommit
40d88983ce
1 измененных файлов с 5 добавлено и 9 удалено
  1. 5 9
      drivers/usb/serial/sierra.c

+ 5 - 9
drivers/usb/serial/sierra.c

@@ -772,16 +772,12 @@ 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;
 
 
-	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);
 	spin_lock_irq(&intfdata->susp_lock);
 	portdata->opened = 0;
 	portdata->opened = 0;
 	if (--intfdata->open_ports == 0)
 	if (--intfdata->open_ports == 0)