---

yaml --- r: 262907 b: refs/heads/master c: 72c487d h: refs/heads/master i: 262905: 9eebc3b 262903: 3bfe311 v: v3
git-mirror · Aug 1, 2011 · dad8d9c · dad8d9c
1 parent f8fdcd7
commit dad8d9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;
 }