summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2013-01-04 23:13:06 +0800
committerFelipe Balbi <balbi@ti.com>2013-01-17 15:45:44 +0200
commit681d1e8761ca773967bce9bd1bb2896f07279551 (patch)
treeb2b767add004f7014a43f224153876dc10ae23bc /drivers/usb/musb
parenta70b84421be5eebde59b0c9e15d20f316e1fbea9 (diff)
downloadlinux-681d1e8761ca773967bce9bd1bb2896f07279551.tar.gz
linux-681d1e8761ca773967bce9bd1bb2896f07279551.tar.bz2
linux-681d1e8761ca773967bce9bd1bb2896f07279551.zip
usb: musb: core: fix failure path
In the fail1~fail5 failure path, pm_runtime_disable() should be called to avoid 'Unbalanced pm_runtime_enable' error in next probe() which may be triggered by defer probe or next 'modprobe musb_hdrc'. Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Cc: <stable@vger.kernel.org> v3.8 Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r--drivers/usb/musb/musb_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index f1c6c5470b92..8219eb5abec0 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1993,6 +1993,7 @@ fail2:
musb_platform_exit(musb);
fail1:
+ pm_runtime_disable(musb->controller);
dev_err(musb->controller,
"musb_init_controller failed with status %d\n", status);