Commit dba3e701 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

media: uvcvideo: Fix power line control for a Chicony camera 



The device does not implement the control properly.

Fixes v4l2-compliance error:

info: checking control 'Power Line Frequency' (0x00980918)
fail: v4l2-test-controls.cpp(552): could not set valid menu item 3

Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 350ab13e

drivers/media/usb/uvc/uvc_driver.c

+9 −0
Original line number Diff line number Diff line
@@ -2592,6 +2592,15 @@ static const struct usb_device_id uvc_ids[] = { 
	  .bInterfaceSubClass	= 1,

	  .bInterfaceProtocol	= 0,

	  .driver_info		= (kernel_ulong_t)&uvc_ctrl_power_line_limited },

	/* Chicony Electronics Co., Ltd Integrated Camera */

	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE

				| USB_DEVICE_ID_MATCH_INT_INFO,

	  .idVendor		= 0x04f2,

	  .idProduct		= 0xb67c,

	  .bInterfaceClass	= USB_CLASS_VIDEO,

	  .bInterfaceSubClass	= 1,

	  .bInterfaceProtocol	= UVC_PC_PROTOCOL_15,

	  .driver_info		= (kernel_ulong_t)&uvc_ctrl_power_line_uvc11 },

	/* Chicony EasyCamera */

	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE

				| USB_DEVICE_ID_MATCH_INT_INFO,