diff options
author | Kishon Vijay Abraham I <kishon@ti.com> | 2012-03-21 12:00:20 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-04-10 12:11:49 -0400 |
commit | 3006dc8c627d738693e910c159630e4368c9e86c (patch) | |
tree | 4630442d92afa5ac6f77465ef0a14799c2f90478 /drivers/usb | |
parent | bf070bc14178f1458e7eccd76316ac24f76f1890 (diff) |
usb: musb: omap: fix crash when musb glue (omap) gets initialized
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.
Cc: stable@vger.kernel.org # v3.0, v3.1, v3.2, v3.3
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/musb/omap2430.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 3dfd122266f4..0fb4ce84d17e 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c | |||
@@ -453,14 +453,14 @@ static int __devinit omap2430_probe(struct platform_device *pdev) | |||
453 | goto err2; | 453 | goto err2; |
454 | } | 454 | } |
455 | 455 | ||
456 | pm_runtime_enable(&pdev->dev); | ||
457 | |||
456 | ret = platform_device_add(musb); | 458 | ret = platform_device_add(musb); |
457 | if (ret) { | 459 | if (ret) { |
458 | dev_err(&pdev->dev, "failed to register musb device\n"); | 460 | dev_err(&pdev->dev, "failed to register musb device\n"); |
459 | goto err2; | 461 | goto err2; |
460 | } | 462 | } |
461 | 463 | ||
462 | pm_runtime_enable(&pdev->dev); | ||
463 | |||
464 | return 0; | 464 | return 0; |
465 | 465 | ||
466 | err2: | 466 | err2: |