Skip to content

Commit

Permalink
[media] uvcvideo: Don't report unsupported menu entries
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent e01a234 commit fc2d573
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions drivers/media/video/uvc/uvc_ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit fc2d573

Please sign in to comment.