Commit 8c4f99cd authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: ftdi_sio: fix initialisation of latency timeout

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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b4fc2aee
...@@ -1184,7 +1184,6 @@ static int read_latency_timer(struct usb_serial_port *port) ...@@ -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) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment