summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/oti6858.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-06-26 16:47:23 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-23 16:21:50 -0700
commitd7be62211125c85fa1dd796e92aadce84961a502 (patch)
tree5f8264375419cc85e33a7ed57c93271a2dabe2ab /drivers/usb/serial/oti6858.c
parentf5f45304512fa167883dbf7cc23ff92008b173e7 (diff)
downloadlinux-d7be62211125c85fa1dd796e92aadce84961a502.tar.bz2
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/oti6858.c')
-rw-r--r--drivers/usb/serial/oti6858.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index cf509c8c1aa1..baa2ea59b921 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -343,6 +343,8 @@ static int oti6858_port_probe(struct usb_serial_port *port)
usb_set_serial_port_data(port, priv);
+ port->port.drain_delay = 256; /* FIXME: check the FIFO length */
+
return 0;
}
@@ -558,7 +560,7 @@ static int oti6858_open(struct tty_struct *tty, struct usb_serial_port *port)
/* setup termios */
if (tty)
oti6858_set_termios(tty, port, &tmp_termios);
- port->port.drain_delay = 256; /* FIXME: check the FIFO length */
+
return 0;
}