From: Greg Kroah-Hartman Date: Mon, 14 Oct 2013 17:15:50 +0000 (-0700) Subject: Revert "USB: OHCI: Properly handle ohci-spear suspend" X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3de80bfc1c9dc2b791e1f00671356279f2a9442b;p=linux-beck.git Revert "USB: OHCI: Properly handle ohci-spear suspend" This reverts commit 36a8758736238c9354f46b39ca506e9acabe82d0. 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 --- diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c index 41148f8895a4..31ff3fc4e26f 100644 --- a/drivers/usb/host/ohci-spear.c +++ b/drivers/usb/host/ohci-spear.c @@ -130,26 +130,20 @@ static int spear_ohci_hcd_drv_remove(struct platform_device *pdev) } #if defined(CONFIG_PM) -static int spear_ohci_hcd_drv_suspend(struct platform_device *pdev, +static int spear_ohci_hcd_drv_suspend(struct platform_device *dev, pm_message_t message) { - struct usb_hcd *hcd = platform_get_drvdata(pdev); + struct usb_hcd *hcd = platform_get_drvdata(dev); struct ohci_hcd *ohci = hcd_to_ohci(hcd); struct spear_ohci *sohci_p = to_spear_ohci(hcd); - bool do_wakeup = device_may_wakeup(&pdev->dev); - int ret; if (time_before(jiffies, ohci->next_statechange)) msleep(5); ohci->next_statechange = jiffies; - ret = ohci_suspend(hcd, do_wakeup); - if (ret) - return ret; - clk_disable_unprepare(sohci_p->clk); - return ret; + return 0; } static int spear_ohci_hcd_drv_resume(struct platform_device *dev)