diff options
| author | Anton Arapov <anton@redhat.com> | 2012-05-09 08:48:00 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-05-09 08:48:00 +0200 |
| commit | c0e33d8195b424eb29432998c565d09398933d32 (patch) | |
| tree | 0bca45b5a68691709a11fea3ad78fd6a6cb98c02 /drivers/usb/musb | |
| parent | b4b6116a13633898cf868f2f103c96a90c4c20f8 (diff) | |
| download | kernel-uprobes-c0e33d8195b424eb29432998c565d09398933d32.tar.gz kernel-uprobes-c0e33d8195b424eb29432998c565d09398933d32.tar.xz kernel-uprobes-c0e33d8195b424eb29432998c565d09398933d32.zip | |
fedora kernel: 5963c7872d2bee76ac20ba1ccd2ffbbfe9eb5f8bv3.3.5-2
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/omap2430.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index df719eae3b0..11541e884b4 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -281,7 +281,8 @@ static void musb_otg_notifier_work(struct work_struct *data_notifier_work) static int omap2430_musb_init(struct musb *musb) { - u32 l, status = 0; + u32 l; + int status = 0; struct device *dev = musb->controller; struct musb_hdrc_platform_data *plat = dev->platform_data; struct omap_musb_board_data *data = plat->board_data; @@ -300,7 +301,7 @@ static int omap2430_musb_init(struct musb *musb) status = pm_runtime_get_sync(dev); if (status < 0) { - dev_err(dev, "pm_runtime_get_sync FAILED"); + dev_err(dev, "pm_runtime_get_sync FAILED %d\n", status); goto err1; } @@ -451,14 +452,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: |