From: Felipe Balbi Date: Fri, 13 Feb 2015 20:54:38 +0000 (-0600) Subject: usb: host: fotg210: use new USB_RESUME_TIMEOUT X-Git-Tag: v3.19.7~104 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3d8f2c37446856f862f19b3f7b1ee31d49634ca;p=thirdparty%2Fkernel%2Fstable.git usb: host: fotg210: use new USB_RESUME_TIMEOUT commit 7e136bb71a08e8b8be3bc492f041d9b0bea3856d upstream. Make sure we're using the new macro, so our resume signaling will always pass certification. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c index ecf02b2623e83..c4794e378ea71 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c @@ -1595,7 +1595,7 @@ static int fotg210_hub_control( /* resume signaling for 20 msec */ fotg210_writel(fotg210, temp | PORT_RESUME, status_reg); fotg210->reset_done[wIndex] = jiffies - + msecs_to_jiffies(20); + + msecs_to_jiffies(USB_RESUME_TIMEOUT); break; case USB_PORT_FEAT_C_SUSPEND: clear_bit(wIndex, &fotg210->port_c_suspend);