mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From f9515bb74e74a5f3f7cb963984bdd8c8731495ff Mon Sep 17 00:00:00 2001
|
|
From: Yuri Matylitski <ym@tekinsoft.com>
|
|
Date: Fri, 20 Apr 2012 12:38:32 +0300
|
|
Subject: [PATCH 025/165] USB: serial: cp210x: Fixed usb_control_msg timeout
|
|
values
|
|
|
|
commit 2d5733fcd33dd451022d197cb6b476e970519ca7 upstream.
|
|
|
|
Fixed too small hardcoded timeout values for usb_control_msg
|
|
in driver for SiliconLabs cp210x-based usb-to-serial adapters.
|
|
Replaced with USB_CTRL_GET_TIMEOUT/USB_CTRL_SET_TIMEOUT.
|
|
|
|
Signed-off-by: Yuri Matylitski <ym@tekinsoft.com>
|
|
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/usb/serial/cp210x.c | 9 ++++++---
|
|
1 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
|
|
index 4c12404..f2c57e0 100644
|
|
--- a/drivers/usb/serial/cp210x.c
|
|
+++ b/drivers/usb/serial/cp210x.c
|
|
@@ -285,7 +285,8 @@ static int cp210x_get_config(struct usb_serial_port *port, u8 request,
|
|
/* Issue the request, attempting to read 'size' bytes */
|
|
result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
|
|
request, REQTYPE_DEVICE_TO_HOST, 0x0000,
|
|
- port_priv->bInterfaceNumber, buf, size, 300);
|
|
+ port_priv->bInterfaceNumber, buf, size,
|
|
+ USB_CTRL_GET_TIMEOUT);
|
|
|
|
/* Convert data into an array of integers */
|
|
for (i = 0; i < length; i++)
|
|
@@ -335,12 +336,14 @@ static int cp210x_set_config(struct usb_serial_port *port, u8 request,
|
|
result = usb_control_msg(serial->dev,
|
|
usb_sndctrlpipe(serial->dev, 0),
|
|
request, REQTYPE_HOST_TO_DEVICE, 0x0000,
|
|
- port_priv->bInterfaceNumber, buf, size, 300);
|
|
+ port_priv->bInterfaceNumber, buf, size,
|
|
+ USB_CTRL_SET_TIMEOUT);
|
|
} else {
|
|
result = usb_control_msg(serial->dev,
|
|
usb_sndctrlpipe(serial->dev, 0),
|
|
request, REQTYPE_HOST_TO_DEVICE, data[0],
|
|
- port_priv->bInterfaceNumber, NULL, 0, 300);
|
|
+ port_priv->bInterfaceNumber, NULL, 0,
|
|
+ USB_CTRL_SET_TIMEOUT);
|
|
}
|
|
|
|
kfree(buf);
|
|
--
|
|
1.7.7.6
|
|
|