]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
V4L/DVB: uvcvideo: Return -ERANGE when setting a control to an out-of-range menu...
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Thu, 21 Jan 2010 19:53:11 +0000 (16:53 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 26 Feb 2010 18:11:04 +0000 (15:11 -0300)
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>
drivers/media/video/uvc/uvc_ctrl.c

index 61576946329df5766c2cedd9a77adaaed02ff232..f4e5ba260968c6a2c06c30f487a997f5d0b9a4d6 100644 (file)
@@ -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;
        }