lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: ftdi_sio: fix initialisation of latency timeout

Browse Source 
Latency timeout was read but never stored on port probe. When
ASYNC_LOW_LATENCY was cleared the device timeout would get set to 0
rather than the default 16ms.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Johan Hovold
2009-11-22 21:25:20 +01:00
committed by Greg Kroah-Hartman
parent b4fc2aeef2
commit 8c4f99cd54
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/serial/ftdi_sio.c
View File

@@ -1184,7 +1184,6 @@ static int read_latency_timer(struct usb_serial_port *port)
unsigned short latency = 0; unsigned short latency = 0;
int rv = 0; int rv = 0;
dbg("%s", __func__); dbg("%s", __func__);
rv = usb_control_msg(udev, rv = usb_control_msg(udev,
@@ -1197,8 +1196,9 @@ static int read_latency_timer(struct usb_serial_port *port)
if (rv < 0) { if (rv < 0) {
dev_err(&port->dev, "Unable to read latency timer: %i\n", rv); dev_err(&port->dev, "Unable to read latency timer: %i\n", rv);
return -EIO; return -EIO;
} } else
return latency; priv->latency = latency;
return rv;
} }
static int get_serial_info(struct usb_serial_port *port, static int get_serial_info(struct usb_serial_port *port,
@@ -1584,7 +1584,8 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
ftdi_determine_type(port); ftdi_determine_type(port);
ftdi_set_max_packet_size(port); ftdi_set_max_packet_size(port);
read_latency_timer(port); if (read_latency_timer(port) < 0)
priv->latency = 16;
create_sysfs_attrs(port); create_sysfs_attrs(port);
return 0; return 0;
} }