Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8afe97be authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] uvcvideo: Enable UVC 1.5 device detection 



UVC 1.5 devices report a bInterfaceProtocol value set to 1 in their
interface descriptors. The uvcvideo driver only matches on
bInterfaceProtocol 0, preventing those devices from being detected.

More changes to the driver are needed for full UVC 1.5 compatibility.
However, at least the UVC 1.5 Microsoft Surface Pro 3 cameras have been
reported to work out of the box with the driver with an updated match
table.

Enable UVC 1.5 support in the match table to support the devices that
can work with the current driver implementation. Devices that can't will
fail, but that's hardly a regression as they're currently not detected
at all anyway.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 1ea7252d

drivers/media/usb/uvc/uvc_driver.c

+2 −1
Original line number Diff line number Diff line
@@ -2540,7 +2540,8 @@ static struct usb_device_id uvc_ids[] = { 
	  .bInterfaceProtocol	= 0,

	  .driver_info		= UVC_QUIRK_FORCE_Y8 },

	/* Generic USB Video Class */

	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, 0) },

	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },

	{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },

	{}

};

include/uapi/linux/usb/video.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


/* A.3. Video Interface Protocol Codes */

#define UVC_PC_PROTOCOL_UNDEFINED			0x00

#define UVC_PC_PROTOCOL_15				0x01



/* A.5. Video Class-Specific VC Interface Descriptor Subtypes */

#define UVC_VC_DESCRIPTOR_UNDEFINED			0x00