From: Felipe Balbi Date: Fri, 13 Feb 2015 20:50:10 +0000 (-0600) Subject: usb: host: isp116x: use new USB_RESUME_TIMEOUT X-Git-Tag: v3.18.14~138 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1106b21fb9b0331a575f9386b80a7acb5c817c7;p=profile%2Fwearable%2Fplatform%2Fkernel%2Flinux-3.18-exynos7270.git usb: host: isp116x: use new USB_RESUME_TIMEOUT [ Upstream commit 8c0ae6574ccfd3d619876a65829aad74c9d22ba5 ] Make sure we're using the new macro, so our resume signaling will always pass certification. Cc: # v3.10+ Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 240e792..b62298f 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c @@ -1487,7 +1487,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);