summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2013-01-04 23:13:06 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-28 05:38:42 -0800
commit0452c262ae9c36d5b896395bee1f7cf1e7962f75 (patch)
treedcb60db1a739c353c7925dd8efcede2baf3f9d30
parentc8f96b36a83763b2cdedaec489eb39d3394a2366 (diff)
downloadlinux-stable-0452c262ae9c36d5b896395bee1f7cf1e7962f75.tar.gz
linux-stable-0452c262ae9c36d5b896395bee1f7cf1e7962f75.tar.bz2
linux-stable-0452c262ae9c36d5b896395bee1f7cf1e7962f75.zip
usb: musb: core: fix failure path
commit 681d1e8761ca773967bce9bd1bb2896f07279551 upstream. 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> Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 fd3486745e64..60b41cc28da4 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);