From: Felipe Balbi Date: Fri, 13 Feb 2015 21:38:33 +0000 (-0600) Subject: usb: core: hub: use new USB_RESUME_TIMEOUT X-Git-Tag: v3.16.35~2229 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52c647a656ed475a39c446c05ee9c5a4633c8579;p=thirdparty%2Fkernel%2Fstable.git usb: core: hub: use new USB_RESUME_TIMEOUT commit bbc78c07a51f6fd29c227b1220a9016e585358ba 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: Luis Henriques --- diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 0e0e0354c5230..4209fc7d91c69 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3375,10 +3375,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