---

yaml --- r: 232646 b: refs/heads/master c: 3c47eb0 h: refs/heads/master v: v3
git-mirror · Jan 23, 2011 · c444572 · c444572
1 parent d2653d2
commit c444572
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d14fc1a74e846d7851f24fc9519fe87dc12a1231
+refs/heads/master: 3c47eb06f08eb970ea9d696bcdb57a175d37b470
diff --git a/trunk/drivers/usb/gadget/composite.c b/trunk/drivers/usb/gadget/composite.c
@@ -928,8 +928,9 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
 		 */
 		switch (ctrl->bRequestType & USB_RECIP_MASK) {
 		case USB_RECIP_INTERFACE:
-			if (cdev->config)
-				f = cdev->config->interface[intf];
+			if (!cdev->config || w_index >= MAX_CONFIG_INTERFACES)
+				break;
+			f = cdev->config->interface[intf];
 			break;
 
 		case USB_RECIP_ENDPOINT: