Revert "USB: OHCI: Properly handle OHCI controller suspend"

This reverts commit 476e4bf939c9b947ea49923700fbac655cc9057c.

Manjunath is no longer at Linaro, the email address bounces.  Given
that, and the fact that others have reported problems with these
patches, I'm reverting them until someone from Linaro who can SUPPORT
THEM submits them.

I will no longer accept patches from linaro.com developers unless a
senior Linaro developer has signed off on them, which did not happen
with this patch set.

Reported-by: Olof Johansson <olof@lixom.net>
Cc: Manjunath Goudar <manjunath.goudar@linaro.org>
Cc: Manjunath Goudar <csmanjuvijay@gmail.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Arnd Bergmann <arnd@arndb.de>

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 310bcfe4ebc4ae106a1b469a89265341ec532b53..8ada13f8dde2c7350977cf343987fbb14c2f303b 100644 (file)
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1036,7 +1036,6 @@ int ohci_suspend(struct usb_hcd *hcd, bool do_wakeup)
 {
        struct ohci_hcd *ohci = hcd_to_ohci (hcd);
        unsigned long   flags;
-       int             rc = 0;
 
        /* Disable irq emission and mark HW unaccessible. Use
         * the spinlock to properly synchronize with possible pending
@@ -1049,13 +1048,7 @@ int ohci_suspend(struct usb_hcd *hcd, bool do_wakeup)
        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
        spin_unlock_irqrestore (&ohci->lock, flags);
 
-       synchronize_irq(hcd->irq);
-
-       if (do_wakeup && HCD_WAKEUP_PENDING(hcd)) {
-               ohci_resume(hcd, false);
-               rc = -EBUSY;
-       }
-       return rc;
+       return 0;
 }
 EXPORT_SYMBOL_GPL(ohci_suspend);