diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-06-26 16:47:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-23 16:21:50 -0700 |
| commit | d7be62211125c85fa1dd796e92aadce84961a502 (patch) | |
| tree | 5f8264375419cc85e33a7ed57c93271a2dabe2ab /drivers/usb/serial/cypress_m8.c | |
| parent | f5f45304512fa167883dbf7cc23ff92008b173e7 (diff) | |
| download | blackbird-op-linux-d7be62211125c85fa1dd796e92aadce84961a502.tar.gz blackbird-op-linux-d7be62211125c85fa1dd796e92aadce84961a502.zip | |
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/cypress_m8.c')
| -rw-r--r-- | drivers/usb/serial/cypress_m8.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index e948dc02795d..558605d646f3 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c @@ -495,6 +495,8 @@ static int cypress_generic_port_probe(struct usb_serial_port *port) } usb_set_serial_port_data(port, priv); + port->port.drain_delay = 256; + return 0; } @@ -625,7 +627,7 @@ static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port) __func__, result); cypress_set_dead(port); } - port->port.drain_delay = 256; + return result; } /* cypress_open */ |
