aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2012-03-21 21:30:20 +0530
committerBen Hutchings <ben@decadent.org.uk>2012-05-11 13:14:05 +0100
commitf48a6c0a5a021f575ca37d923b4149317bcb4c63 (patch)
treec5df0f1175a3462c2a9818d1f0ce38e3c0126001 /drivers/usb/musb
parent5292bdd3ee31c6893a62df34b39e3814bfa4b553 (diff)
downloadkernel_samsung_smdk4412-f48a6c0a5a021f575ca37d923b4149317bcb4c63.zip
kernel_samsung_smdk4412-f48a6c0a5a021f575ca37d923b4149317bcb4c63.tar.gz
kernel_samsung_smdk4412-f48a6c0a5a021f575ca37d923b4149317bcb4c63.tar.bz2
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/musb')
-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 ba85f27..c53aaa9 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: