From dad8d9cf7c13b08a8c48bb1f9d3fdd93d7f1a338 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Wed, 20 Jul 2011 17:09:34 -0700 Subject: [PATCH] --- yaml --- r: 262907 b: refs/heads/master c: 72c487dfb94d02025fb7437dfe2314d836d5a9ab h: refs/heads/master i: 262905: 9eebc3b9620c683b8c68baa588d706c0c972d370 262903: 3bfe311ffd79fb6b69975a7f9a144f89b70f91b8 v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musb_gadget.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index da72c82cd1d3..ba753037b95d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4aefec5daf51ebda90ebf0989598c206cf8e640 +refs/heads/master: 72c487dfb94d02025fb7437dfe2314d836d5a9ab diff --git a/trunk/drivers/usb/musb/musb_gadget.c b/trunk/drivers/usb/musb/musb_gadget.c index b67a062f556b..8c41a2e6ea77 100644 --- a/trunk/drivers/usb/musb/musb_gadget.c +++ b/trunk/drivers/usb/musb/musb_gadget.c @@ -1698,6 +1698,8 @@ static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on) is_on = !!is_on; + pm_runtime_get_sync(musb->controller); + /* NOTE: this assumes we are sensing vbus; we'd rather * not pullup unless the B-session is active. */ @@ -1707,6 +1709,9 @@ static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on) musb_pullup(musb, is_on); } spin_unlock_irqrestore(&musb->lock, flags); + + pm_runtime_put(musb->controller); + return 0; }