---

yaml --- r: 325875 b: refs/heads/master c: 11c37c8 h: refs/heads/master i: 325873: b216140 325871: f60d7fd v: v3
git-mirror · Aug 23, 2012 · 4f5bbda · 4f5bbda
1 parent 5001e93
commit 4f5bbda
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dcaa252fdf01e4ba49ece156812043baf01c7cc
+refs/heads/master: 11c37c8b64b9d9d4ab19d387e6028eee3ec188d3
diff --git a/trunk/drivers/usb/gadget/mv_udc_core.c b/trunk/drivers/usb/gadget/mv_udc_core.c
@@ -1221,12 +1221,16 @@ static int mv_udc_vbus_session(struct usb_gadget *gadget, int is_active)
 			udc_start(udc);
 		}
 	} else if (udc->driver && udc->softconnect) {
+		if (!udc->active)
+			goto out;
+
 		/* stop all the transfer in queue*/
 		stop_activity(udc, udc->driver);
 		udc_stop(udc);
 		mv_udc_disable(udc);
 	}
 
+out:
 	spin_unlock_irqrestore(&udc->lock, flags);
 	return retval;
 }