summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Fleytman <dmitry@daynix.com>2017-09-05 11:40:56 +0300
committerBen Hutchings <ben@decadent.org.uk>2018-01-01 20:50:49 +0000
commit0f87665439a5b128c3b76571e7bdaf061c9a2225 (patch)
tree616eb06d175a35d289d0df439a11647186160300 /drivers
parentc95d921ebf9e02853bd090f3b3845085082185f8 (diff)
downloadlinux-0f87665439a5b128c3b76571e7bdaf061c9a2225.tar.gz
linux-0f87665439a5b128c3b76571e7bdaf061c9a2225.tar.bz2
linux-0f87665439a5b128c3b76571e7bdaf061c9a2225.zip
usb: Increase quirk delay for USB devices
commit b2a542bbb3081dbd64acc8929c140d196664c406 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/core/config.c2
-rw-r--r--drivers/usb/core/hub.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index ea15bccf30a7..9e0c680f0922 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -830,7 +830,7 @@ int usb_get_configuration(struct usb_device *dev)
}
if (dev->quirks & USB_QUIRK_DELAY_INIT)
- msleep(100);
+ msleep(200);
result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno,
bigbuffer, length);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 7c5946640888..18dcd1c763ab 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -3552,7 +3552,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
usb_detect_quirks(udev);
if (udev->quirks & USB_QUIRK_DELAY_INIT)
- msleep(1000);
+ msleep(2000);
/* consecutive bus-powered hubs aren't reliable; they can
* violate the voltage drop budget. if the new child has