Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (129 commits)
  [PATCH] USB Storage: fix Rio Karma eject support build error
  USB: Airprime driver improvements to allow full speed EvDO transfers
  USB: remove OTG build warning
  USB: EHCI update VIA workaround
  USB: force root hub resume after power loss
  USB: ohci_usb can oops on shutdown
  USB: Dealias -110 code (more complete)
  USB: Remove unneeded void * casts in core files
  USB: u132-hcd: host controller driver for ELAN U132 adapter
  USB: ftdi-elan: client driver for ELAN Uxxx adapters
  usb serial: support Alcor Micro Corp. USB 2.0 TO RS-232 through pl2303 driver
  USB: Moschip 7840 USB-Serial Driver
  USB: add PlayStation 2 Trance Vibrator driver
  USB: Add ADU support for Ontrak ADU devices
  aircable: fix printk format warnings
  Add AIRcable USB Bluetooth Dongle Driver
  cypress_m8: implement graceful failure handling
  cypress_m8: improve control endpoint error handling
  cypress_m8: use usb_fill_int_urb where appropriate
  cypress_m8: use appropriate URB polling interval
  ...

1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index c545ef92fe29..16fb72eb6fc9 100644
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -84,6 +84,7 @@ static void uhci_finish_suspend(struct uhci_hcd *uhci, int port,
                 unsigned long port_addr)
 {
         int status;
+        int i;
 
         if (inw(port_addr) & (USBPORTSC_SUSP | USBPORTSC_RD)) {
                 CLR_RH_PORTSTAT(USBPORTSC_SUSP | USBPORTSC_RD);
@@ -92,9 +93,14 @@ static void uhci_finish_suspend(struct uhci_hcd *uhci, int port,
 
                 /* The controller won't actually turn off the RD bit until
                  * it has had a chance to send a low-speed EOP sequence,
-                 * which takes 3 bit times (= 2 microseconds).  We'll delay
-                 * slightly longer for good luck. */
-                udelay(4);
+                 * which is supposed to take 3 bit times (= 2 microseconds).
+                 * Experiments show that some controllers take longer, so
+                 * we'll poll for completion. */
+                for (i = 0; i < 10; ++i) {
+                        if (!(inw(port_addr) & USBPORTSC_RD))
+                                break;
+                        udelay(1);
+                }
         }
         clear_bit(port, &uhci->resuming_ports);
 }