On Fri, Apr 20, 2012 at 11:32:02AM +0300, Yuri Matylitski wrote: The first line of the commit message (which is in Subject) should be a short summary of the change. More detailed description should be added after an empty line. More commit message hints: http://who-t.blogspot.com/2009/12/on-commit-messages.html Otherwise: Acked-by: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx> > Signed-off-by: Yuri Matylitski <ym@xxxxxxxxxxxxx> > --- > 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 0310e2d..e56066b 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, > /* 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); > -- > 1.7.0.4 > -- Kirill A. Shutemov -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
