From 1fc8b7f2d0f67d5eb5ad593a9c50df3694d8d2b5 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Mon, 19 Dec 2011 22:17:51 +0200 Subject: [PATCH] --- yaml --- r: 280909 b: refs/heads/master c: 702ac61c51873ac4b7a66c2518219508ae5fe695 h: refs/heads/master i: 280907: 545bc81e8b62db67fd6d4d54ccd93adc570a8c14 v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/omap2430.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5dde9172fc1a..4e8430ee17a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08dec56ee29f06b4fbdf5f5b1b3d2c2397aabe17 +refs/heads/master: 702ac61c51873ac4b7a66c2518219508ae5fe695 diff --git a/trunk/drivers/usb/musb/omap2430.c b/trunk/drivers/usb/musb/omap2430.c index 4f31814eebf3..c27bbbf32b52 100644 --- a/trunk/drivers/usb/musb/omap2430.c +++ b/trunk/drivers/usb/musb/omap2430.c @@ -336,7 +336,6 @@ static int omap2430_musb_init(struct musb *musb) return 0; err1: - pm_runtime_disable(dev); return status; } @@ -479,7 +478,6 @@ static int __exit omap2430_remove(struct platform_device *pdev) platform_device_del(glue->musb); platform_device_put(glue->musb); pm_runtime_put(&pdev->dev); - pm_runtime_disable(&pdev->dev); kfree(glue); return 0;