usb: gadget: uvc: Updating bcdUVC field to 0x0110

Command Verifier during UVC Descriptor Tests (Class Video Control
Interface Descriptor Test Video) complains about:

Video Control Interface Header bcdUVC is 0x0100. USB Video Class
specification 1.0 has been replaced by 1.1 specification
(UVC: 6.2.26) Class Video Control Interface Descriptor bcdUVC is not 1.1

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/20210315065926.30152-1-pawell@gli-login.cadence.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index 00fb58e..cd28dec 100644 (file)
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -231,7 +231,7 @@ static struct config_item *uvcg_control_header_make(struct config_group *group,
        h->desc.bLength                 = UVC_DT_HEADER_SIZE(1);
        h->desc.bDescriptorType         = USB_DT_CS_INTERFACE;
        h->desc.bDescriptorSubType      = UVC_VC_HEADER;
-       h->desc.bcdUVC                  = cpu_to_le16(0x0100);
+       h->desc.bcdUVC                  = cpu_to_le16(0x0110);
        h->desc.dwClockFrequency        = cpu_to_le32(48000000);
 
        config_item_init_type_name(&h->item, name, &uvcg_control_header_type);

diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c
index a9f8eb8..3a61de4 100644 (file)
--- a/drivers/usb/gadget/legacy/webcam.c
+++ b/drivers/usb/gadget/legacy/webcam.c
@@ -90,7 +90,7 @@ static const struct UVC_HEADER_DESCRIPTOR(1) uvc_control_header = {
        .bLength                = UVC_DT_HEADER_SIZE(1),
        .bDescriptorType        = USB_DT_CS_INTERFACE,
        .bDescriptorSubType     = UVC_VC_HEADER,
-       .bcdUVC                 = cpu_to_le16(0x0100),
+       .bcdUVC                 = cpu_to_le16(0x0110),
        .wTotalLength           = 0, /* dynamic */
        .dwClockFrequency       = cpu_to_le32(48000000),
        .bInCollection          = 0, /* dynamic */