From b0ff6dc652d80afd5d022de1c91d9a8430181d92 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 1 Mar 2013 20:46:22 +0100 Subject: [PATCH] --- yaml --- r: 364720 b: refs/heads/master c: f9e612002fc50b3ae7cd1349eb2387e5430b44d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/f_uvc.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4c965abf258f..4d031ec2d3ce 100644 --- 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 index 92efd6ec48af..dd372ce9f3e2 100644 --- 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)