---

yaml
---
r: 74335
b: refs/heads/master
c: 1cb5265
h: refs/heads/master
i:
  74333: 1e238ec
  74331: 7b9ba8b
  74327: 9b1a0e1
  74319: df4a132
  74303: 75dda3d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cf1973a44bd298e3cfce6f6af8faa8c9d0a6d55
+refs/heads/master: 1cb52658b4f5b10a9e91f8e1c21ca2bcc1b9a3ca

trunk/drivers/usb/host/ehci-hcd.c

@@ -575,12 +575,15 @@ static int ehci_run (struct usb_hcd *hcd)
 	 * from the companions to the EHCI controller.  If any of the
 	 * companions are in the middle of a port reset at the time, it
 	 * could cause trouble.  Write-locking ehci_cf_port_reset_rwsem
-	 * guarantees that no resets are in progress.
+	 * guarantees that no resets are in progress.  After we set CF,
+	 * a short delay lets the hardware catch up; new resets shouldn't
+	 * be started before the port switching actions could complete.
 	 */
 	down_write(&ehci_cf_port_reset_rwsem);
 	hcd->state = HC_STATE_RUNNING;
 	ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag);
 	ehci_readl(ehci, &ehci->regs->command);	/* unblock posted writes */
+	msleep(5);
 	up_write(&ehci_cf_port_reset_rwsem);
 
 	temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase));