---

yaml --- r: 108461 b: refs/heads/master c: f362a47 h: refs/heads/master i: 108459: c4147db v: v3
git-mirror · Aug 14, 2008 · 4ac1a26 · 4ac1a26
1 parent e65c97e
commit 4ac1a26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 550a7375fe720924241f0eb76e4a5c1a3eb8c32f
+refs/heads/master: f362a47560070ec0aaf68ac6b45901eeed1c844f
diff --git a/trunk/drivers/usb/musb/musb_gadget.c b/trunk/drivers/usb/musb/musb_gadget.c
@@ -1710,17 +1710,15 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
 
 	spin_unlock_irqrestore(&musb->lock, flags);
 
-	if (retval == 0)
+	if (retval == 0) {
 		retval = driver->bind(&musb->g);
-	if (retval != 0) {
-		DBG(3, "bind to driver %s failed --> %d\n",
-			driver->driver.name, retval);
-		musb->gadget_driver = NULL;
-		musb->g.dev.driver = NULL;
-	}
+		if (retval != 0) {
+			DBG(3, "bind to driver %s failed --> %d\n",
+					driver->driver.name, retval);
+			musb->gadget_driver = NULL;
+			musb->g.dev.driver = NULL;
+		}
 
-	/* start peripheral and/or OTG engines */
-	if (retval == 0) {
 		spin_lock_irqsave(&musb->lock, flags);
 
 		/* REVISIT always use otg_set_peripheral(), handling