diff options
| author | Yuri Matylitski <ym@tekinsoft.com> | 2012-04-20 05:38:32 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-20 11:44:24 -0400 |
| commit | 2d5733fcd33dd451022d197cb6b476e970519ca7 (patch) | |
| tree | 353926a97842cc4c345081e9e9609802e8a32cd2 /drivers | |
| parent | 8034761c219ce545a9f4d3b23cfda47a0027cc8c (diff) | |
USB: serial: cp210x: Fixed usb_control_msg timeout values
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>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 0310e2df59f5..ec30f95ef399 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
| @@ -287,7 +287,8 @@ static int cp210x_get_config(struct usb_serial_port *port, u8 request, | |||
| 287 | /* Issue the request, attempting to read 'size' bytes */ | 287 | /* Issue the request, attempting to read 'size' bytes */ |
| 288 | result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), | 288 | result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), |
| 289 | request, REQTYPE_DEVICE_TO_HOST, 0x0000, | 289 | request, REQTYPE_DEVICE_TO_HOST, 0x0000, |
| 290 | port_priv->bInterfaceNumber, buf, size, 300); | 290 | port_priv->bInterfaceNumber, buf, size, |
| 291 | USB_CTRL_GET_TIMEOUT); | ||
| 291 | 292 | ||
| 292 | /* Convert data into an array of integers */ | 293 | /* Convert data into an array of integers */ |
| 293 | for (i = 0; i < length; i++) | 294 | for (i = 0; i < length; i++) |
| @@ -340,12 +341,14 @@ static int cp210x_set_config(struct usb_serial_port *port, u8 request, | |||
| 340 | result = usb_control_msg(serial->dev, | 341 | result = usb_control_msg(serial->dev, |
| 341 | usb_sndctrlpipe(serial->dev, 0), | 342 | usb_sndctrlpipe(serial->dev, 0), |
| 342 | request, REQTYPE_HOST_TO_DEVICE, 0x0000, | 343 | request, REQTYPE_HOST_TO_DEVICE, 0x0000, |
| 343 | port_priv->bInterfaceNumber, buf, size, 300); | 344 | port_priv->bInterfaceNumber, buf, size, |
| 345 | USB_CTRL_SET_TIMEOUT); | ||
| 344 | } else { | 346 | } else { |
| 345 | result = usb_control_msg(serial->dev, | 347 | result = usb_control_msg(serial->dev, |
| 346 | usb_sndctrlpipe(serial->dev, 0), | 348 | usb_sndctrlpipe(serial->dev, 0), |
| 347 | request, REQTYPE_HOST_TO_DEVICE, data[0], | 349 | request, REQTYPE_HOST_TO_DEVICE, data[0], |
| 348 | port_priv->bInterfaceNumber, NULL, 0, 300); | 350 | port_priv->bInterfaceNumber, NULL, 0, |
| 351 | USB_CTRL_SET_TIMEOUT); | ||
| 349 | } | 352 | } |
| 350 | 353 | ||
| 351 | kfree(buf); | 354 | kfree(buf); |
