USB: metro-usb: 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/metro-usb.c b/drivers/usb/serial/metro-usb.c
index bf3c7a23553efbe73d1c12b4e7b910d506fed474..47e247759eb0ed975ddcca6482b34080525397d3 100644 (file)
--- a/drivers/usb/serial/metro-usb.c
+++ b/drivers/usb/serial/metro-usb.c
@@ -177,10 +177,7 @@ static void metrousb_cleanup(struct usb_serial_port *port)
        usb_unlink_urb(port->interrupt_in_urb);
        usb_kill_urb(port->interrupt_in_urb);
 
-       mutex_lock(&port->serial->disc_mutex);
-       if (!port->serial->disconnected)
-               metrousb_send_unidirectional_cmd(UNI_CMD_CLOSE, port);
-       mutex_unlock(&port->serial->disc_mutex);
+       metrousb_send_unidirectional_cmd(UNI_CMD_CLOSE, port);
 }
 
 static int metrousb_open(struct tty_struct *tty, struct usb_serial_port *port)