[media] uvcvideo: Don't report unsupported menu entries

Supported menu entries are reported by the device in response to the
GET_RES query. Use the information to return -EINVAL to userspace for
unsupported values when enumerating menu entries.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index d6fe13de7ae4da17db5fe523c8375b55a4370291..0dc2a9f7ca51c6c1fb3aaf5abd950cb9dac4573f 100644 (file)
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -1015,6 +1015,24 @@ int uvc_query_v4l2_menu(struct uvc_video_chain *chain,
        }
 
        menu_info = &mapping->menu_info[query_menu->index];
+
+       if (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES) {
+               s32 bitmap;
+
+               if (!ctrl->cached) {
+                       ret = uvc_ctrl_populate_cache(chain, ctrl);
+                       if (ret < 0)
+                               goto done;
+               }
+
+               bitmap = mapping->get(mapping, UVC_GET_RES,
+                                     uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES));
+               if (!(bitmap & menu_info->value)) {
+                       ret = -EINVAL;
+                       goto done;
+               }
+       }
+
        strlcpy(query_menu->name, menu_info->name, sizeof query_menu->name);
 
 done: