summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAxel Haslam <ahaslam@baylibre.com>2016-11-24 11:50:56 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-29 17:31:36 +0100
commit640308b72f7d2afe4c85c9191f82bc0ef33ea243 (patch)
tree35bb6b1eca9d750fea4661143bf7c5925dc5f23f /drivers/usb
parent190534f64ac39aa569934391de19d7df9370fc9f (diff)
downloadblackbird-obmc-linux-640308b72f7d2afe4c85c9191f82bc0ef33ea243.tar.gz
blackbird-obmc-linux-640308b72f7d2afe4c85c9191f82bc0ef33ea243.zip
USB: ohci: da8xx: Resume the entire host controller
The da8xx ohci controller is not working after suspend and resume. This is because only the root hub is being resumed. Balance the ohci_suspend of the suspend path with an ohci_resume in the resume path so that we resume the entire controller, and not just the root hub. Also, while we are here, remove setting device power_state, as this is no longer needed and scheduled for removal Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Axel Haslam <ahaslam@baylibre.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ohci-da8xx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 9e336f4085f2..05da2cb59612 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -528,8 +528,7 @@ static int ohci_da8xx_resume(struct platform_device *dev)
if (ret)
return ret;
- dev->dev.power.power_state = PMSG_ON;
- usb_hcd_resume_root_hub(hcd);
+ ohci_resume(hcd, false);
return 0;
}
OpenPOWER on IntegriCloud