From ca1ad0ffcaa6194a05a2612f8afb49179d998256 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 14 Oct 2013 10:19:10 -0700 Subject: [PATCH] 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 Cc: Manjunath Goudar Cc: Manjunath Goudar Cc: Alan Stern Cc: Arnd Bergmann --- drivers/usb/host/ohci-hcd.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 310bcfe4ebc4..8ada13f8dde2 100644 --- 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); -- 2.34.1