From: Felipe Balbi Date: Fri, 13 Feb 2015 20:55:34 +0000 (-0600) Subject: usb: host: fusbh200: use new USB_RESUME_TIMEOUT X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=595227db1f2d98bfc33f02a55842f268e12b247d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git usb: host: fusbh200: use new USB_RESUME_TIMEOUT Make sure we're using the new macro, so our resume signaling will always pass certification. Cc: # v3.10+ Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/host/fusbh200-hcd.c b/drivers/usb/host/fusbh200-hcd.c index a83eefefffda..ba77e2e43f62 100644 --- a/drivers/usb/host/fusbh200-hcd.c +++ b/drivers/usb/host/fusbh200-hcd.c @@ -1550,10 +1550,9 @@ static int fusbh200_hub_control ( if ((temp & PORT_PE) == 0) goto error; - /* resume signaling for 20 msec */ fusbh200_writel(fusbh200, temp | PORT_RESUME, status_reg); fusbh200->reset_done[wIndex] = jiffies - + msecs_to_jiffies(20); + + msecs_to_jiffies(USB_RESUME_TIMEOUT); break; case USB_PORT_FEAT_C_SUSPEND: clear_bit(wIndex, &fusbh200->port_c_suspend);