Commit 8a4e76c1 authored Jan 21, 2010 by Laurent Pinchart Committed by Mauro Carvalho Chehab Feb 26, 2010

V4L/DVB: uvcvideo: Return -ERANGE when setting a control to an out-of-range menu index



The V4L2 specification states that out of bounds control values must
either be clamped to the valid range or result in a -ERANGE error code.

Fix the driver to return -ERANGE instead of -EINVAL when setting a menu
control to an invalid value.

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

parent 36bd883e

drivers/media/video/uvc/uvc_ctrl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1006,7 +1006,7 @@ int uvc_ctrl_set(struct uvc_video_chain *chain,

		if (mapping->v4l2_type == V4L2_CTRL_TYPE_MENU) {
		if (value < 0 \|\| value >= mapping->menu_count)
		return -EINVAL;
		return -ERANGE;
		value = mapping->menu_info[value].value;
		}