USB: cp210x: always disable uart on close

Always try to disable the uart on close.

Since the switch to tty ports, close will be called as part of shutdown
before disconnect returns. Hence there is no need to check the
disconnected flag, and we can put devices in disabled states also on
driver unbind.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 4747d1c328ffbdc13e1ca4337dc11a6c557711f5..2c659553c07c01df5dc1a65be8341809939fc6f4 100644 (file)
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -462,11 +462,7 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
 static void cp210x_close(struct usb_serial_port *port)
 {
        usb_serial_generic_close(port);
-
-       mutex_lock(&port->serial->disc_mutex);
-       if (!port->serial->disconnected)
-               cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_DISABLE);
-       mutex_unlock(&port->serial->disc_mutex);
+       cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_DISABLE);
 }
 
 /*