---

yaml --- r: 354594 b: refs/heads/master c: 681d1e8 h: refs/heads/master v: v3
git-mirror · Jan 17, 2013 · c989e3f · c989e3f
1 parent 57d6b3c
commit c989e3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a70b84421be5eebde59b0c9e15d20f316e1fbea9
+refs/heads/master: 681d1e8761ca773967bce9bd1bb2896f07279551
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
@@ -1993,6 +1993,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 	musb_platform_exit(musb);
 
 fail1:
+	pm_runtime_disable(musb->controller);
 	dev_err(musb->controller,
 		"musb_init_controller failed with status %d\n", status);