Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 279e1545 authored by Ian Abbott's avatar Ian Abbott Committed by Linus Torvalds
Browse files

[PATCH] 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: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 74ede0ff

drivers/usb/serial/ftdi_sio.c

+3 −2
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ static struct usb_serial_device_type ftdi_sio_device = { 




#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 @@ static int change_speed(struct usb_serial_port *port) 
			    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 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_ 
			    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__);

	}