[PATCH 1/3] usb: musb: fix pm_runtime mismatches

From: Felipe Contreras
Date: Thu Dec 15 2011 - 18:05:26 EST


Properly call pm_runtime_put() afer pm_runttime_get() on errors.

Untested.

Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
drivers/usb/musb/musb_gadget.c | 1 +
drivers/usb/musb/omap2430.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 922148f..95bfd2d 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1960,6 +1960,7 @@ static int musb_gadget_start(struct usb_gadget *g,
err2:
if (!is_otg_enabled(musb))
musb_stop(musb);
+ pm_runtime_put(musb->controller);
err0:
return retval;
}
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index ba85f27..4edfb91 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -385,6 +385,7 @@ static void omap2430_musb_disable(struct musb *musb)

static int omap2430_musb_exit(struct musb *musb)
{
+ pm_runtime_put(musb->controller);
del_timer_sync(&musb_idle_timer);

omap2430_low_level_exit(musb);
--
1.7.8.rc1.14.g248db

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/