usb: core: hub: use new USB_RESUME_TIMEOUT
authorFelipe Balbi <balbi@ti.com>
Fri, 13 Feb 2015 21:38:33 +0000 (15:38 -0600)
committerFelipe Balbi <balbi@ti.com>
Tue, 7 Apr 2015 17:58:36 +0000 (12:58 -0500)
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>
drivers/usb/core/hub.c

index d7c3d5a35946a63a905dc2501ec72beae0c5fe42..3b7151687776817bf34981c878833a25fbda119f 100644 (file)
@@ -3406,10 +3406,10 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
        if (status) {
                dev_dbg(&port_dev->dev, "can't resume, status %d\n", status);
        } else {
-               /* drive resume for at least 20 msec */
+               /* drive resume for USB_RESUME_TIMEOUT msec */
                dev_dbg(&udev->dev, "usb %sresume\n",
                                (PMSG_IS_AUTO(msg) ? "auto-" : ""));
-               msleep(25);
+               msleep(USB_RESUME_TIMEOUT);
 
                /* Virtual root hubs can trigger on GET_PORT_STATUS to
                 * stop resume signaling.  Then finish the resume