USB: mos7720: 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/mos7720.c b/drivers/usb/serial/mos7720.c
index d1e2bf30bff809ba4ac8a1eeef3f06d207b349f6..fc506bb71315d97a2273c81324d48d57c549a629 100644 (file)
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1140,16 +1140,9 @@ static void mos7720_close(struct usb_serial_port *port)
        usb_kill_urb(port->write_urb);
        usb_kill_urb(port->read_urb);
 
-       mutex_lock(&serial->disc_mutex);
-       /* these commands must not be issued if the device has
-        * been disconnected */
-       if (!serial->disconnected) {
-               write_mos_reg(serial, port->number - port->serial->minor,
-                             MCR, 0x00);
-               write_mos_reg(serial, port->number - port->serial->minor,
-                             IER, 0x00);
-       }
-       mutex_unlock(&serial->disc_mutex);
+       write_mos_reg(serial, port->number - port->serial->minor, MCR, 0x00);
+       write_mos_reg(serial, port->number - port->serial->minor, IER, 0x00);
+
        mos7720_port->open = 0;
 }