summaryrefslogtreecommitdiff
path: root/drivers/usb/host/isp116x-hcd.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-10 14:45:27 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-10 14:45:27 +0300
commitc8d1bc12c7986c166bd3504213d9df2bc11ad7d6 (patch)
tree9882ae7d9eb103c73029050d62232cd83328be52 /drivers/usb/host/isp116x-hcd.c
parentb7a4abb67416aa07cd65446dd39e64525ccfe8e5 (diff)
parentbbc78c07a51f6fd29c227b1220a9016e585358ba (diff)
downloadlinux-c8d1bc12c7986c166bd3504213d9df2bc11ad7d6.tar.xz
Merge tag 'usb-for-v4.1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-testing
Felipe writes: usb: generic resume timeout for v4.1 This part 2 pull request contains only the patches which make sure everybody on linux uses the same resume timeout value. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/host/isp116x-hcd.c')
-rw-r--r--drivers/usb/host/isp116x-hcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index aa335fa716d1..13181dcd9820 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1490,7 +1490,7 @@ static int isp116x_bus_resume(struct usb_hcd *hcd)
spin_unlock_irq(&isp116x->lock);
hcd->state = HC_STATE_RESUMING;
- msleep(20);
+ msleep(USB_RESUME_TIMEOUT);
/* Go operational */
spin_lock_irq(&isp116x->lock);