usb: host: fusbh200: use new USB_RESUME_TIMEOUT
authorFelipe Balbi <balbi@ti.com>
Fri, 13 Feb 2015 20:55:34 +0000 (14:55 -0600)
committerSasha Levin <sasha.levin@oracle.com>
Sun, 17 May 2015 23:12:00 +0000 (19:12 -0400)
[ Upstream commit 595227db1f2d98bfc33f02a55842f268e12b247d ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/usb/host/fusbh200-hcd.c

index abe42f31559fb25f251f1a0ca4d95a514425b794..50fa8f2eabe351ad06787ead0b8a44841858ca12 100644 (file)
@@ -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);