aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorSakethram Bommisetti <sakethram.bommisetti@stericsson.com>2010-11-24 18:57:39 +0530
committerSrinidhi KASAGAR <srinidhi.kasagar@stericsson.com>2010-11-30 07:05:40 +0100
commit0343419161e40a766b5ee4bded690f6ee371c92e (patch)
tree0c5abad4528b386835b07bdb042b18ce96ce9317 /drivers/usb
parent668cf61af9db5eb15971e1b9ab229504d7c95c63 (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 Change-Id: Ib0b1d9db30a38b410f5d4115875f35a1389506d2 Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9415 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/9657 Reviewed-by: Sundar R IYER <sundar.iyer@stericsson.com> Tested-by: Sundar R IYER <sundar.iyer@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/musb/musb_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index b956e61315a..1bc1d35af04 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2490,7 +2490,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);
@@ -2514,7 +2514,7 @@ static int musb_resume_noirq(struct device *dev)
static const struct dev_pm_ops musb_dev_pm_ops = {
.suspend = musb_suspend,
- .resume_noirq = musb_resume_noirq,
+ .resume = musb_resume,
};
#define MUSB_DEV_PM_OPS (&musb_dev_pm_ops)