提交 6a154ec9 编写于 作者: P Pawel Laszczak 提交者: Greg Kroah-Hartman

usb: webcam: Invalid size of Processing Unit Descriptor

According with USB Device Class Definition for Video Device the
Processing Unit Descriptor bLength should be 12 (10 + bmControlSize),
but it has 11.

Invalid length caused that Processing Unit Descriptor Test Video form
CV tool failed. To fix this issue patch adds bmVideoStandards into
uvc_processing_unit_descriptor structure.

The bmVideoStandards field was added in UVC 1.1 and it wasn't part of
UVC 1.0a.
Reviewed-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: NPawel Laszczak <pawell@cadence.com>
Reviewed-by: NPeter Chen <peter.chen@kernel.org>
Link: https://lore.kernel.org/r/20210315071748.29706-1-pawell@gli-login.cadence.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 98f11978
...@@ -822,6 +822,7 @@ static struct usb_function_instance *uvc_alloc_inst(void) ...@@ -822,6 +822,7 @@ static struct usb_function_instance *uvc_alloc_inst(void)
pd->bmControls[0] = 1; pd->bmControls[0] = 1;
pd->bmControls[1] = 0; pd->bmControls[1] = 0;
pd->iProcessing = 0; pd->iProcessing = 0;
pd->bmVideoStandards = 0;
od = &opts->uvc_output_terminal; od = &opts->uvc_output_terminal;
od->bLength = UVC_DT_OUTPUT_TERMINAL_SIZE; od->bLength = UVC_DT_OUTPUT_TERMINAL_SIZE;
......
...@@ -125,6 +125,7 @@ static const struct uvc_processing_unit_descriptor uvc_processing = { ...@@ -125,6 +125,7 @@ static const struct uvc_processing_unit_descriptor uvc_processing = {
.bmControls[0] = 1, .bmControls[0] = 1,
.bmControls[1] = 0, .bmControls[1] = 0,
.iProcessing = 0, .iProcessing = 0,
.bmVideoStandards = 0,
}; };
static const struct uvc_output_terminal_descriptor uvc_output_terminal = { static const struct uvc_output_terminal_descriptor uvc_output_terminal = {
......
...@@ -302,9 +302,10 @@ struct uvc_processing_unit_descriptor { ...@@ -302,9 +302,10 @@ struct uvc_processing_unit_descriptor {
__u8 bControlSize; __u8 bControlSize;
__u8 bmControls[2]; __u8 bmControls[2];
__u8 iProcessing; __u8 iProcessing;
__u8 bmVideoStandards;
} __attribute__((__packed__)); } __attribute__((__packed__));
#define UVC_DT_PROCESSING_UNIT_SIZE(n) (9+(n)) #define UVC_DT_PROCESSING_UNIT_SIZE(n) (10+(n))
/* 3.7.2.6. Extension Unit Descriptor */ /* 3.7.2.6. Extension Unit Descriptor */
struct uvc_extension_unit_descriptor { struct uvc_extension_unit_descriptor {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册