From 84a78e56884cb8d2e9b28208ce6751f1f74dd518 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 21 Jan 2010 16:53:11 -0300
Subject: [PATCH] --- yaml --- r: 181720 b: refs/heads/master c:
 8a4e76c14cbe0609fdb5c558f867fe7c556bb1c7 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/uvc/uvc_ctrl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7fbf6e279517..d71efdaa1fe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36bd883ef98ac6003ab6ec7b91f66d3fb2159318
+refs/heads/master: 8a4e76c14cbe0609fdb5c558f867fe7c556bb1c7
diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c
index 61576946329d..f4e5ba260968 100644
--- a/trunk/drivers/media/video/uvc/uvc_ctrl.c
+++ b/trunk/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;
 	}