From: Laurent Pinchart Date: Thu, 21 Jan 2010 19:53:11 +0000 (-0300) Subject: V4L/DVB: uvcvideo: Return -ERANGE when setting a control to an out-of-range menu... X-Git-Tag: v2.6.34-rc1~280^2~50 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=8a4e76c14cbe0609fdb5c558f867fe7c556bb1c7;p=net-next-2.6.git 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index 61576946329..f4e5ba26096 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c @@ -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; }