Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8fb6f79 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

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: default avatarFelipe Balbi <balbi@ti.com>
parent ea16328f

drivers/usb/host/uhci-hub.c

+3 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void uhci_check_ports(struct uhci_hcd *uhci) 
				/* Port received a wakeup request */

				set_bit(port, &uhci->resuming_ports);

				uhci->ports_timeout = jiffies +

						msecs_to_jiffies(25);

					msecs_to_jiffies(USB_RESUME_TIMEOUT);

				usb_hcd_start_port_resume(

						&uhci_to_hcd(uhci)->self, port);
@@ -338,7 +338,8 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
			uhci_finish_suspend(uhci, port, port_addr);



			/* USB v2.0 7.1.7.5 */

			uhci->ports_timeout = jiffies + msecs_to_jiffies(50);

			uhci->ports_timeout = jiffies +

				msecs_to_jiffies(USB_RESUME_TIMEOUT);

			break;

		case USB_PORT_FEAT_POWER:

			/* UHCI has no power switching */