aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/host/ohci-hcd.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-12-02 11:32:34 +0800
committerAlex Shi <alex.shi@linaro.org>2016-12-02 11:32:34 +0800
commitf53b36ddf79f246931d94b05925d35f6a85f1827 (patch)
tree8b0fd3220d4fac5ec21e8f4b691e5347851291f1 /drivers/usb/host/ohci-hcd.c
parent5d21882b7a45452960e533f73831423c7f86a799 (diff)
parent2e67ba554184199114a948786e47decb8b9a469b (diff)
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-16.12-rt
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
-rw-r--r--drivers/usb/host/ohci-hcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index d664edabf14e..af2412f5abab 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -72,7 +72,7 @@
static const char hcd_name [] = "ohci_hcd";
#define STATECHANGE_DELAY msecs_to_jiffies(300)
-#define IO_WATCHDOG_DELAY msecs_to_jiffies(250)
+#define IO_WATCHDOG_DELAY msecs_to_jiffies(275)
#include "ohci.h"
#include "pci-quirks.h"