media: uvcvideo: Refactor power_line_frequency_controls_limited

Browse source

[ Upstream commit 3aa8628eb7 ]

Move the control mapping to uvc_ctrl.c. This way we do not have
references to UVC controls or V4L2 controls in uvc_driver.c.

This also fixes a bug introduced in commit 382075604a ("media:
uvcvideo: Limit power line control for Quanta UVC Webcam"). The
offending commit caused the power line control menu entries to have
incorrect indices compared to the V4L2_CID_POWER_LINE_FREQUENCY_*
enumeration. Now that the limited mapping reuses the correct menu_info
array, the indices correctly map to the V4L2 control specification.

Fixes: 382075604a ("media: uvcvideo: Limit power line control for Quanta UVC Webcam")
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

...

This commit is contained in:

Ricardo Ribalda 2023-01-05 14:52:56 +01:00 • committed by Greg Kroah-Hartman

parent 54858223a9

commit 5029464da9

3 changed files with 14 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

drivers/media/usb/uvc/uvc_ctrl.c

View file

18

drivers/media/usb/uvc/uvc_driver.c

View file

1

drivers/media/usb/uvc/uvcvideo.h

View file