From 3241e220df77cddce0abd3dd96aa2417b648509b Mon Sep 17 00:00:00 2001 From: Yuri Matylitski Date: Fri, 20 Apr 2012 12:38:32 +0300 Subject: [PATCH] --- yaml --- r: 299439 b: refs/heads/master c: 2d5733fcd33dd451022d197cb6b476e970519ca7 h: refs/heads/master i: 299437: 6ce9c5e98c022fe796de1ba5447a146f4d1f8d65 299435: 6a43afe658cafa120e49a53a9351f4d7752953f6 299431: b5fb3831e622da9c316549e7d9eb1e48d4c8b309 299423: c18a0543ed7e425646a8b471c7371cee29117ff1 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/cp210x.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 924bac460de4..ecfb1c99eda7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8034761c219ce545a9f4d3b23cfda47a0027cc8c +refs/heads/master: 2d5733fcd33dd451022d197cb6b476e970519ca7 diff --git a/trunk/drivers/usb/serial/cp210x.c b/trunk/drivers/usb/serial/cp210x.c index 0310e2df59f5..ec30f95ef399 100644 --- a/trunk/drivers/usb/serial/cp210x.c +++ b/trunk/drivers/usb/serial/cp210x.c @@ -287,7 +287,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++) @@ -340,12 +341,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);