diff options
| author | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-09-27 10:27:48 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-09-27 10:27:56 +0200 |
| commit | d67614f276c1499ad939fa5c1aadd35498cc6b34 (patch) | |
| tree | e8c6962c714f0ef0275dd103bf5be56513412492 /drivers/media/usb | |
| parent | 70a7ce22e9229f216c638426a854efd5bd127b24 (diff) | |
| parent | 3a99c4474112f49a5459933d8758614002ca0ddc (diff) | |
| download | linux-d67614f276c1499ad939fa5c1aadd35498cc6b34.tar.bz2 | |
Merge fixes into media_stage
* fixes:
media: rkvdec: Disable H.264 error detection
media: mediatek: vcodec: Drop platform_get_resource(IORESOURCE_IRQ)
media: dvb_vb2: fix possible out of bound access
media: v4l2-ioctl.c: fix incorrect error path
media: v4l2-compat-ioctl32.c: zero buffer passed to v4l2_compat_get_array_args()
media: uvcvideo: Fix InterfaceProtocol for Quanta camera
Diffstat (limited to 'drivers/media/usb')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 639fd7bab5d5..744051b52e12 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2740,7 +2740,7 @@ static const struct usb_device_id uvc_ids[] = { .idProduct = 0x4034, .bInterfaceClass = USB_CLASS_VIDEO, .bInterfaceSubClass = 1, - .bInterfaceProtocol = 0, + .bInterfaceProtocol = UVC_PC_PROTOCOL_15, .driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited }, /* LogiLink Wireless Webcam */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE |