浏览代码

usb: Increase quirk delay for USB devices

Commit e0429362ab15
("usb: Add device quirk for Logitech HD Pro Webcams C920 and C930e")
introduced quirk to workaround an issue with some Logitech webcams.

The workaround is introducing delay for some USB operations.

According to our testing, delay introduced by original commit
is not long enough and in rare cases we still see issues described
by the aforementioned commit.

This patch increases delays introduced by original commit.
Having this patch applied we do not see those problems anymore.

Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dmitry Fleytman 8 年之前
父节点
当前提交
b2a542bbb3
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      drivers/usb/core/config.c
  2. 1 1
      drivers/usb/core/hub.c

+ 1 - 1
drivers/usb/core/config.c

@@ -852,7 +852,7 @@ int usb_get_configuration(struct usb_device *dev)
 		}
 		}
 
 
 		if (dev->quirks & USB_QUIRK_DELAY_INIT)
 		if (dev->quirks & USB_QUIRK_DELAY_INIT)
-			msleep(100);
+			msleep(200);
 
 
 		result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno,
 		result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno,
 		    bigbuffer, length);
 		    bigbuffer, length);

+ 1 - 1
drivers/usb/core/hub.c

@@ -4838,7 +4838,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
 			goto loop;
 			goto loop;
 
 
 		if (udev->quirks & USB_QUIRK_DELAY_INIT)
 		if (udev->quirks & USB_QUIRK_DELAY_INIT)
-			msleep(1000);
+			msleep(2000);
 
 
 		/* consecutive bus-powered hubs aren't reliable; they can
 		/* consecutive bus-powered hubs aren't reliable; they can
 		 * violate the voltage drop budget.  if the new child has
 		 * violate the voltage drop budget.  if the new child has