usb: musb: core: fix failure path
authorMing Lei <ming.lei@canonical.com>
Fri, 4 Jan 2013 15:13:06 +0000 (23:13 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Feb 2013 13:38:42 +0000 (05:38 -0800)
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>
drivers/usb/musb/musb_core.c

index fd34867..60b41cc 100644 (file)
@@ -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);