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: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Pawel Laszczak <pawell@cadence.com> Reviewed-by: Peter Chen <peter.chen@kernel.org> Link: https://lore.kernel.org/r/20210315071748.29706-1-pawell@gli-login.cadence.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
98f11978bd
Коммит
6a154ec9ef
|
@ -822,6 +822,7 @@ static struct usb_function_instance *uvc_alloc_inst(void)
|
|||
pd->bmControls[0] = 1;
|
||||
pd->bmControls[1] = 0;
|
||||
pd->iProcessing = 0;
|
||||
pd->bmVideoStandards = 0;
|
||||
|
||||
od = &opts->uvc_output_terminal;
|
||||
od->bLength = UVC_DT_OUTPUT_TERMINAL_SIZE;
|
||||
|
|
|
@ -125,6 +125,7 @@ static const struct uvc_processing_unit_descriptor uvc_processing = {
|
|||
.bmControls[0] = 1,
|
||||
.bmControls[1] = 0,
|
||||
.iProcessing = 0,
|
||||
.bmVideoStandards = 0,
|
||||
};
|
||||
|
||||
static const struct uvc_output_terminal_descriptor uvc_output_terminal = {
|
||||
|
|
|
@ -302,9 +302,10 @@ struct uvc_processing_unit_descriptor {
|
|||
__u8 bControlSize;
|
||||
__u8 bmControls[2];
|
||||
__u8 iProcessing;
|
||||
__u8 bmVideoStandards;
|
||||
} __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 */
|
||||
struct uvc_extension_unit_descriptor {
|
||||
|
|
Загрузка…
Ссылка в новой задаче