tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
usb: host: uhci: 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>
+3
-2
+3
-2
drivers/usb/host/uhci-hub.c
+3
-2
drivers/usb/host/uhci-hub.c
···
166
166
/* Port received a wakeup request */
167
167
set_bit(port, &uhci->resuming_ports);
168
168
uhci->ports_timeout = jiffies +
169
-
msecs_to_jiffies(25);
169
+
msecs_to_jiffies(USB_RESUME_TIMEOUT);
170
170
usb_hcd_start_port_resume(
171
171
&uhci_to_hcd(uhci)->self, port);
172
172
···
338
338
uhci_finish_suspend(uhci, port, port_addr);
339
339
340
340
/* USB v2.0 7.1.7.5 */
341
-
uhci->ports_timeout = jiffies + msecs_to_jiffies(50);
341
+
uhci->ports_timeout = jiffies +
342
+
msecs_to_jiffies(USB_RESUME_TIMEOUT);
342
343
break;
343
344
case USB_PORT_FEAT_POWER:
344
345
/* UHCI has no power switching */