aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2015-02-13 15:55:34 -0500
committerFelipe Balbi <balbi@ti.com>2015-04-07 13:58:35 -0400
commit595227db1f2d98bfc33f02a55842f268e12b247d (patch)
tree2a2597c63a29af7542e5a0a8d3cd281f7037d424 /drivers/usb
parent7e136bb71a08e8b8be3bc492f041d9b0bea3856d (diff)
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: <stable@vger.kernel.org> # v3.10+ Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/fusbh200-hcd.c3
1 files changed, 1 insertions, 2 deletions
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 (
1550 if ((temp & PORT_PE) == 0) 1550 if ((temp & PORT_PE) == 0)
1551 goto error; 1551 goto error;
1552 1552
1553 /* resume signaling for 20 msec */
1554 fusbh200_writel(fusbh200, temp | PORT_RESUME, status_reg); 1553 fusbh200_writel(fusbh200, temp | PORT_RESUME, status_reg);
1555 fusbh200->reset_done[wIndex] = jiffies 1554 fusbh200->reset_done[wIndex] = jiffies
1556 + msecs_to_jiffies(20); 1555 + msecs_to_jiffies(USB_RESUME_TIMEOUT);
1557 break; 1556 break;
1558 case USB_PORT_FEAT_C_SUSPEND: 1557 case USB_PORT_FEAT_C_SUSPEND:
1559 clear_bit(wIndex, &fusbh200->port_c_suspend); 1558 clear_bit(wIndex, &fusbh200->port_c_suspend);