From a500d44abaad5d51f5091d188bc4322afcd222f0 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 6 Aug 2009 06:05:40 -0300
Subject: [PATCH] --- yaml --- r: 173949 b: refs/heads/master c:
 f4eabafeb3ea41801260fba624cbf2da971d19f8 h: refs/heads/master i:   173947:
 0ceb9362bb1b5a2b7091817934351c53cdd8bf53 v: v3

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

diff --git a/[refs] b/[refs]
index 817da25ff4b6..6ff69e7738fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebbb5c3e0eb73db4da5bee57cd0344a74cf73319
+refs/heads/master: f4eabafeb3ea41801260fba624cbf2da971d19f8
diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c
index 1b89735e62fd..6f1487fc3d7c 100644
--- a/trunk/drivers/media/video/uvc/uvc_ctrl.c
+++ b/trunk/drivers/media/video/uvc/uvc_ctrl.c
@@ -826,6 +826,13 @@ int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,
 		ret = 0;
 		goto out;
 
+	case V4L2_CTRL_TYPE_BUTTON:
+		v4l2_ctrl->minimum = 0;
+		v4l2_ctrl->maximum = 0;
+		v4l2_ctrl->step = 0;
+		ret = 0;
+		goto out;
+
 	default:
 		break;
 	}