From ian.abbott@mev.co.uk Tue Jul 19 09:38:25 2005
Message-ID: <42DD0126.8070503@mev.co.uk>
Date: Tue, 19 Jul 2005 14:33:26 +0100
From: Ian Abbott <abbotti@mev.co.uk>
To: Greg KH <greg@kroah.com>
Subject: USB: ftdi_sio: fix a couple of timeouts
ftdi_sio: Fix timeouts in a couple of usb_control_msg() calls due to
change of units from jiffies to milliseconds in 2.6.12.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/serial/ftdi_sio.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
--- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c 2005-07-27 14:54:56.000000000 -0700
+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c 2005-07-27 14:55:05.000000000 -0700
@@ -548,6 +548,7 @@
#define WDR_TIMEOUT 5000 /* default urb timeout */
+#define WDR_SHORT_TIMEOUT 1000 /* shorter urb timeout */
/* High and low are for DTR, RTS etc etc */
#define HIGH 1
@@ -681,7 +682,7 @@
FTDI_SIO_SET_BAUDRATE_REQUEST,
FTDI_SIO_SET_BAUDRATE_REQUEST_TYPE,
urb_value, urb_index,
- buf, 0, 100);
+ buf, 0, WDR_SHORT_TIMEOUT);
kfree(buf);
return rv;
@@ -1786,7 +1787,7 @@
FTDI_SIO_SET_DATA_REQUEST,
FTDI_SIO_SET_DATA_REQUEST_TYPE,
urb_value , priv->interface,
- buf, 0, 100) < 0) {
+ buf, 0, WDR_SHORT_TIMEOUT) < 0) {
err("%s FAILED to set databits/stopbits/parity", __FUNCTION__);
}