summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2012-03-21 21:30:20 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-27 10:16:51 -0700
commit6407c7c9a16e5778e93da2b067c80f7a609a9e37 (patch)
treef615214e98d9c72fe24ecb03c29345bab5daa3e9
parent6793b13c9aedea8e24cf429b924d6dabfd59e0d8 (diff)
downloadlwn-6407c7c9a16e5778e93da2b067c80f7a609a9e37.tar.gz
lwn-6407c7c9a16e5778e93da2b067c80f7a609a9e37.zip
usb: musb: omap: fix crash when musb glue (omap) gets initialized
commit 3006dc8c627d738693e910c159630e4368c9e86c upstream. pm_runtime_enable is being called after omap2430_musb_init. Hence pm_runtime_get_sync in omap2430_musb_init does not have any effect (does not enable clocks) resulting in a crash during register access. It is fixed here. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/musb/omap2430.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index df719eae3b03..26f75655f3cb 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -451,14 +451,14 @@ static int __init omap2430_probe(struct platform_device *pdev)
goto err2;
}
+ pm_runtime_enable(&pdev->dev);
+
ret = platform_device_add(musb);
if (ret) {
dev_err(&pdev->dev, "failed to register musb device\n");
goto err2;
}
- pm_runtime_enable(&pdev->dev);
-
return 0;
err2: