Merge branch 'master' of ../linux-2.6/

4 files changed, 26 insertions, 21 deletions

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index d97b16b52efa..bf8be2a41a4a 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -69,10 +69,9 @@ config USB_EHCI_BIG_ENDIAN_DESC
         default y
 
 config USB_EHCI_FSL
-        bool
-        depends on USB_EHCI_HCD
+        bool "Support for Freescale on-chip EHCI USB controller"
+        depends on USB_EHCI_HCD && FSL_SOC
         select USB_EHCI_ROOT_HUB_TT
-        default y if MPC834x || PPC_MPC831x
         ---help---
           Variation of ARC USB block used in some Freescale chips.
 
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 4caa6a8b9a37..b8ad55aff842 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -862,18 +862,18 @@ static int ehci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                 /* reschedule QH iff another request is queued */
                 if (!list_empty (&qh->qtd_list)
                                 && HC_IS_RUNNING (hcd->state)) {
-                        int schedule_status;
-
-                        schedule_status = qh_schedule (ehci, qh);
-                        spin_unlock_irqrestore (&ehci->lock, flags);
-
-                        if (schedule_status != 0) {
-                                // shouldn't happen often, but ...
-                                // FIXME kill those tds' urbs
-                                err ("can't reschedule qh %p, err %d",
-                                        qh, schedule_status);
-                        }
-                        return status;
+                        rc = qh_schedule(ehci, qh);
+
+                        /* An error here likely indicates handshake failure
+                         * or no space left in the schedule.  Neither fault
+                         * should happen often ...
+                         *
+                         * FIXME kill the now-dysfunctional queued urbs
+                         */
+                        if (rc != 0)
+                                ehci_err(ehci,
+                                        "can't reschedule qh %p, err %d",
+                                        qh, rc);
                 }
                 break;
 
@@ -1014,7 +1014,7 @@ MODULE_LICENSE ("GPL");
 #endif
 
 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
-    !defined(PS3_SYSTEM_BUS_DRIVER)
+    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
 #error "missing bus glue for ehci-hcd"
 #endif
 
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index ba370c56172c..59be276ccd9d 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1766,6 +1766,7 @@ sl811h_suspend(struct platform_device *dev, pm_message_t state)
                 retval = sl811h_bus_suspend(hcd);
                 break;
         case PM_EVENT_SUSPEND:
+        case PM_EVENT_HIBERNATE:
         case PM_EVENT_PRETHAW:          /* explicitly discard hw state */
                 port_power(sl811, 0);
                 break;
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index ac283b09a63f..3033d6945202 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -3213,15 +3213,20 @@ static int u132_suspend(struct platform_device *pdev, pm_message_t state)
                 dev_err(&u132->platform_dev->dev, "device is being removed\n");
                 return -ESHUTDOWN;
         } else {
-                int retval = 0;
-                if (state.event == PM_EVENT_FREEZE) {
+                int retval = 0, ports;
+
+                switch (state.event) {
+                case PM_EVENT_FREEZE:
                         retval = u132_bus_suspend(hcd);
-                } else if (state.event == PM_EVENT_SUSPEND) {
-                        int ports = MAX_U132_PORTS;
+                        break;
+                case PM_EVENT_SUSPEND:
+                case PM_EVENT_HIBERNATE:
+                        ports = MAX_U132_PORTS;
                         while (ports-- > 0) {
                                 port_power(u132, ports, 0);
                         }
-                }
+                        break;
+                }
                 if (retval == 0)
                         pdev->dev.power.power_state = state;
                 return retval;