diff options
author | Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> | 2011-08-24 17:43:47 +0530 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:03:06 +0200 |
commit | 4fdffdbfe43ab3967b23345f745ea760f34f2a4d (patch) | |
tree | 623c2187447bb26e960a7bd869ba15910d2af4ba | |
parent | 80ddfc25baf8fcca2a5e311c3346bd9f560cf210 (diff) |
Generic:USB:Pairing suspend/resume correctly for musb
Changing the resume_noirq call to resume call so that suspend/resume is paired
and we will have a stable USB power save.
ST-Ericsson ID: ER 280150
Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com>
-rw-r--r-- | drivers/usb/musb/musb_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index ce76ef3e182..8045b6efa26 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2330,7 +2330,7 @@ static int musb_suspend(struct device *dev) return 0; } -static int musb_resume_noirq(struct device *dev) +static int musb_resume(struct device *dev) { /* for static cmos like DaVinci, register values were preserved * unless for some reason the whole soc powered down or the USB @@ -2371,7 +2371,7 @@ static int musb_runtime_resume(struct device *dev) static const struct dev_pm_ops musb_dev_pm_ops = { .suspend = musb_suspend, - .resume_noirq = musb_resume_noirq, + .resume = musb_resume, .runtime_suspend = musb_runtime_suspend, .runtime_resume = musb_runtime_resume, }; |