summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-04-18 17:33:17 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-19 10:24:13 -0700
commitb6fd35ee5766143d6bc3c333edf374c336ebdca6 (patch)
treed83304cfaf72bf36654e38e618c704bebc954bbd
parentac9e59cad7b0b699b2aa9a104eb22ed67a560e02 (diff)
downloadop-kernel-dev-b6fd35ee5766143d6bc3c333edf374c336ebdca6.zip
op-kernel-dev-b6fd35ee5766143d6bc3c333edf374c336ebdca6.tar.gz
USB: io_ti: fix TIOCGSERIAL
Fix regression introduced by commit f40d78155 ("USB: io_ti: kill custom closing_wait implementation") which made TIOCGSERIAL return the wrong value for closing_wait. Signed-off-by: Johan Hovold <jhovold@gmail.com> Cc: stable <stable@vger.kernel.org> # 3.9 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/io_ti.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index f2a1601..ab979a2 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2357,7 +2357,7 @@ static int get_serial_info(struct edgeport_port *edge_port,
cwait = edge_port->port->port.closing_wait;
if (cwait != ASYNC_CLOSING_WAIT_NONE)
- cwait = jiffies_to_msecs(closing_wait) / 10;
+ cwait = jiffies_to_msecs(cwait) / 10;
memset(&tmp, 0, sizeof(tmp));
OpenPOWER on IntegriCloud