---

yaml --- r: 280909 b: refs/heads/master c: 702ac61 h: refs/heads/master i: 280907: 545bc81 v: v3
git-mirror · Dec 20, 2011 · 1fc8b7f · 1fc8b7f
1 parent 91b92d5
commit 1fc8b7f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;