diff options
author | Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> | 2011-08-24 17:43:47 +0530 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:00:08 +0200 |
commit | 0f1708d5e8406d0cf24b3be5f8098d0401cc610a (patch) | |
tree | ad97bc97a0d7e9b08a8c42374cf7500c2e35da4b | |
parent | 83efe97dde61721f44bd1f565d273cf26267c9b7 (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 d8012de253b..fdd3182330b 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2355,7 +2355,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) { struct platform_device *pdev = to_platform_device(dev); struct musb *musb = dev_to_musb(&pdev->dev); @@ -2401,7 +2401,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, }; |