]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usb: musb: omap: fix crash when musb glue (omap) gets initialized
authorKishon Vijay Abraham I <kishon@ti.com>
Wed, 21 Mar 2012 16:00:20 +0000 (21:30 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Apr 2012 16:51:08 +0000 (09:51 -0700)
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>
drivers/usb/musb/omap2430.c

index c5d4c44d0ffa334246e801c131862bf318ba29cc..ffe9d2c108acc37705bedcb1bd1722e57eaed512 100644 (file)
@@ -464,14 +464,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: