openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: gadget: uvc: Fix string descriptor STALL issue when multiple uvc functions are added to a configuration 

This patch solved the string descriptor STALL issue when we add multiple UVC
functions in a single configuration using a 'webcam.c' like composite driver.

Signed-off-by: Bhupesh Sharma <bhupesh.sharma@st.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Bhupesh Sharma 2012-06-01 15:08:54 +05:30 committed by Felipe Balbi
parent 0a00790ff4
commit 3de6e63f78
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/usb/gadget/f_uvc.c
View File

@ -619,22 +619,28 @@ uvc_bind_config(struct usb_configuration *c,
uvc->desc.fs_streaming = fs_streaming; uvc->desc.fs_streaming = fs_streaming;
uvc->desc.hs_streaming = hs_streaming; uvc->desc.hs_streaming = hs_streaming;
/* Allocate string descriptor numbers. */ /* maybe allocate device-global string IDs, and patch descriptors */
if ((ret = usb_string_id(c->cdev)) < 0) if (uvc_en_us_strings[UVC_STRING_ASSOCIATION_IDX].id == 0) {
goto error; /* Allocate string descriptor numbers. */
uvc_en_us_strings[UVC_STRING_ASSOCIATION_IDX].id = ret; ret = usb_string_id(c->cdev);
uvc_iad.iFunction = ret; if (ret < 0)
goto error;
uvc_en_us_strings[UVC_STRING_ASSOCIATION_IDX].id = ret;
uvc_iad.iFunction = ret;
if ((ret = usb_string_id(c->cdev)) < 0) ret = usb_string_id(c->cdev);
goto error; if (ret < 0)
uvc_en_us_strings[UVC_STRING_CONTROL_IDX].id = ret; goto error;
uvc_control_intf.iInterface = ret; uvc_en_us_strings[UVC_STRING_CONTROL_IDX].id = ret;
uvc_control_intf.iInterface = ret;
if ((ret = usb_string_id(c->cdev)) < 0) ret = usb_string_id(c->cdev);
goto error; if (ret < 0)
uvc_en_us_strings[UVC_STRING_STREAMING_IDX].id = ret; goto error;
uvc_streaming_intf_alt0.iInterface = ret; uvc_en_us_strings[UVC_STRING_STREAMING_IDX].id = ret;
uvc_streaming_intf_alt1.iInterface = ret; uvc_streaming_intf_alt0.iInterface = ret;
uvc_streaming_intf_alt1.iInterface = ret;
}
/* Register the function. */ /* Register the function. */
uvc->func.name = "uvc"; uvc->func.name = "uvc";