diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-21 12:37:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 13:54:31 -0700 |
| commit | cf41aa9e19052d467b54786090e1d3ba9104e394 (patch) | |
| tree | 3907a6999f2da67dee2ff790f8120fa1faacf575 /drivers/usb/serial | |
| parent | 5813f281bba6603bed52d6005a9d6a9f23f5c061 (diff) | |
| download | linux-cf41aa9e19052d467b54786090e1d3ba9104e394.tar.gz linux-cf41aa9e19052d467b54786090e1d3ba9104e394.tar.bz2 linux-cf41aa9e19052d467b54786090e1d3ba9104e394.zip | |
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>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/mos7720.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index d1e2bf30bff8..fc506bb71315 100644 --- 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; } |