diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-04-30 09:46:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 09:30:43 -0300 |
| commit | fc2d573fb4e65393688d32bc128c70ddd8ecccc6 (patch) | |
| tree | 3f824598c496536f9f0b7b008bb94eb5e723191b /drivers/media/video/uvc | |
| parent | e01a234407af60c4b9854d069a7217d75fcdfa29 (diff) | |
| download | kernel_samsung_smdk4412-fc2d573fb4e65393688d32bc128c70ddd8ecccc6.zip kernel_samsung_smdk4412-fc2d573fb4e65393688d32bc128c70ddd8ecccc6.tar.gz kernel_samsung_smdk4412-fc2d573fb4e65393688d32bc128c70ddd8ecccc6.tar.bz2 | |
[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>
Diffstat (limited to 'drivers/media/video/uvc')
| -rw-r--r-- | drivers/media/video/uvc/uvc_ctrl.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index d6fe13d..0dc2a9f 100644 --- 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: |