From 5d931288afe971c4018222681456226264e6a7c1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 14 Oct 2013 10:18:25 -0700 Subject: [PATCH] Revert "USB: OHCI: Properly handle ohci-da8xx suspend" This reverts commit 86a63f10211ba7d249763bbe10b52073273affa8. 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-da8xx.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index f8238a41c98c..9be59f11e051 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -406,26 +406,19 @@ static int ohci_hcd_da8xx_drv_remove(struct platform_device *dev) } #ifdef CONFIG_PM -static int ohci_da8xx_suspend(struct platform_device *pdev, - pm_message_t message) +static int ohci_da8xx_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); - 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; - ohci_da8xx_clock(0); hcd->state = HC_STATE_SUSPENDED; - - return ret; + dev->dev.power.power_state = PMSG_SUSPEND; + return 0; } static int ohci_da8xx_resume(struct platform_device *dev) -- 2.39.5