---

yaml --- r: 364720 b: refs/heads/master c: f9e6120 h: refs/heads/master v: v3
git-mirror · Mar 18, 2013 · b0ff6dc · b0ff6dc
1 parent d6525ab
commit b0ff6dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddb5147cea10308fac7d4ea44cbd164929199e03
+refs/heads/master: f9e612002fc50b3ae7cd1349eb2387e5430b44d9
diff --git a/trunk/drivers/usb/gadget/f_uvc.c b/trunk/drivers/usb/gadget/f_uvc.c
@@ -800,7 +800,10 @@ uvc_bind_config(struct usb_configuration *c,
 	uvc->desc.hs_streaming = hs_streaming;
 	uvc->desc.ss_streaming = ss_streaming;
 
-	/* Allocate string descriptor numbers. */
+	/* String descriptors are global, we only need to allocate string IDs
+	 * for the first UVC function. UVC functions beyond the first (if any)
+	 * will reuse the same IDs.
+	 */
 	if (uvc_en_us_strings[UVC_STRING_ASSOCIATION_IDX].id == 0) {
 		ret = usb_string_ids_tab(c->cdev, uvc_en_us_strings);
 		if (ret)