diff options
author | Johan Hovold <jhovold@gmail.com> | 2013-06-26 10:47:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-23 19:21:50 -0400 |
commit | d7be62211125c85fa1dd796e92aadce84961a502 (patch) | |
tree | 5f8264375419cc85e33a7ed57c93271a2dabe2ab /drivers/usb/serial/io_ti.c | |
parent | f5f45304512fa167883dbf7cc23ff92008b173e7 (diff) |
USB: serial: set drain delay at port probe
The port drain delay is constant and should be set at port probe rather
than open.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/io_ti.c')
-rw-r--r-- | drivers/usb/serial/io_ti.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 60054e72b75b..d43adc08283c 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -1872,8 +1872,6 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
1872 | 1872 | ||
1873 | ++edge_serial->num_ports_open; | 1873 | ++edge_serial->num_ports_open; |
1874 | 1874 | ||
1875 | port->port.drain_delay = 1; | ||
1876 | |||
1877 | goto release_es_lock; | 1875 | goto release_es_lock; |
1878 | 1876 | ||
1879 | unlink_int_urb: | 1877 | unlink_int_urb: |
@@ -2473,6 +2471,7 @@ static int edge_port_probe(struct usb_serial_port *port) | |||
2473 | } | 2471 | } |
2474 | 2472 | ||
2475 | port->port.closing_wait = msecs_to_jiffies(closing_wait * 10); | 2473 | port->port.closing_wait = msecs_to_jiffies(closing_wait * 10); |
2474 | port->port.drain_delay = 1; | ||
2476 | 2475 | ||
2477 | return 0; | 2476 | return 0; |
2478 | } | 2477 | } |