commit 8cb62d626785d66ad48cad8deda2074a15e8a92b
author Linux Build Service Account <lnxbuild@localhost> Thu Aug 22 19:59:53 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 22 19:59:41 2013 -0700
tree 7e44233fb63c113cf250d94915a6ba65309c855d
parent f7e7639dd549f69099a7008698da03a8c213ea63
parent 13d23af6796c4244cd1ffdef355e0afedec4a714

Merge "USB: gadget: composite: Don't enable endpoints if already enabled"

drivers/usb/gadget/composite.c

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 27d67e3..e068484 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1220,6 +1220,15 @@
 			break;
 		if (w_value && !f->set_alt)
 			break;
+		/*
+		 * We put interfaces in default settings (alt 0)
+		 * upon set config#1. Call set_alt for non-zero
+		 * alternate setting.
+		 */
+		if (!w_value && cdev->config) {
+			value = 0;
+			break;
+		}
 		value = f->set_alt(f, w_index, w_value);
 		if (value == USB_GADGET_DELAYED_STATUS) {
 			DBG(cdev,