Commit 9f22f959 authored Jun 07, 2022 by Ricardo Ribalda Committed by Mauro Carvalho Chehab Jul 16, 2022

media: uvcvideo: Limit power line control for Chicony Easycamera



Two different Easycamera devices do not implement the power line control
correctly. Add a corresponding control mapping override.

Bus 001 Device 003: ID 04f2:b6ba Chicony Electronics Co., Ltd EasyCamera
Device Descriptor:
  bLength                18
  bDescriptorType         1
  bcdUSB               2.00
  bDeviceClass          239 Miscellaneous Device
  bDeviceSubClass         2
  bDeviceProtocol         1 Interface Association
  bMaxPacketSize0        64
  idVendor           0x04f2 Chicony Electronics Co., Ltd
  idProduct          0xb6ba
  bcdDevice           10.70
  iManufacturer           3 Chicony Electronics Co.,Ltd.
  iProduct                1 EasyCamera
  iSerial                 2 0001
  bNumConfigurations      1

Bus 001 Device 003: ID 04f2:b746 Chicony Electronics Co., Ltd EasyCamera
Device Descriptor:
  bLength                18
  bDescriptorType         1
  bcdUSB               2.00
  bDeviceClass          239 Miscellaneous Device
  bDeviceSubClass         2
  bDeviceProtocol         1 Interface Association
  bMaxPacketSize0        64
  idVendor           0x04f2 Chicony Electronics Co., Ltd
  idProduct          0xb746
  bcdDevice           97.57
  iManufacturer           3 Chicony Electronics Co.,Ltd.
  iProduct                1 EasyCamera
  iSerial                 2 0001
  bNumConfigurations      1

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

parent 38207560

drivers/media/usb/uvc/uvc_driver.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -2835,6 +2835,24 @@ static const struct usb_device_id uvc_ids[] = {
		.bInterfaceSubClass = 1,
		.bInterfaceProtocol = 0,
		.driver_info = UVC_INFO_QUIRK(UVC_QUIRK_RESTRICT_FRAME_RATE) },
		/* Chicony EasyCamera */
		{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
		\| USB_DEVICE_ID_MATCH_INT_INFO,
		.idVendor = 0x04f2,
		.idProduct = 0xb6ba,
		.bInterfaceClass = USB_CLASS_VIDEO,
		.bInterfaceSubClass = 1,
		.bInterfaceProtocol = 0,
		.driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited },
		/* Chicony EasyCamera */
		{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
		\| USB_DEVICE_ID_MATCH_INT_INFO,
		.idVendor = 0x04f2,
		.idProduct = 0xb746,
		.bInterfaceClass = USB_CLASS_VIDEO,
		.bInterfaceSubClass = 1,
		.bInterfaceProtocol = 0,
		.driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited },
		/* Alcor Micro AU3820 (Future Boy PC USB Webcam) */
		{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
		\| USB_DEVICE_ID_MATCH_INT_INFO,