diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-02-13 15:38:33 -0600 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-04-07 12:58:36 -0500 |
| commit | bbc78c07a51f6fd29c227b1220a9016e585358ba (patch) | |
| tree | 95ad68a9dcd750726cc964a7c5c02effa3a6756a /drivers/usb | |
| parent | 59c9904cce77b55892e15f40791f1e66e4d3a1e6 (diff) | |
| download | linux-bbc78c07a51f6fd29c227b1220a9016e585358ba.tar.bz2 | |
usb: core: hub: 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/core/hub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index d7c3d5a35946..3b7151687776 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -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 |