summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/uvc/uvcvideo.h
diff options
context:
space:
mode:
authorRicardo Ribalda <ribalda@chromium.org>2023-01-05 14:52:54 +0100
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2023-01-15 22:45:13 +0100
commit40140eda661ea4be219ef194a4f43b7b5e3bbd27 (patch)
tree88dc41a4ae57fb4f21aa6e5f1c062e3e694dfdcc /drivers/media/usb/uvc/uvcvideo.h
parentmedia: uvcvideo: Extend documentation of uvc_video_clock_decode() (diff)
downloadlinux-40140eda661ea4be219ef194a4f43b7b5e3bbd27.tar.xz
linux-40140eda661ea4be219ef194a4f43b7b5e3bbd27.zip
media: uvcvideo: Implement mask for V4L2_CTRL_TYPE_MENU
Replace the count with a mask field that lets us choose not only the max value, but also the minimum value and what values are valid in between. Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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>
Diffstat (limited to 'drivers/media/usb/uvc/uvcvideo.h')
-rw-r--r--drivers/media/usb/uvc/uvcvideo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 8c0df94374c9..e8f277e380a5 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -115,7 +115,7 @@ struct uvc_control_mapping {
u32 data_type;
const struct uvc_menu_info *menu_info;
- u32 menu_count;
+ unsigned long menu_mask;
u32 master_id;
s32 master_manual;