From 299743cc05aa24c4537f1191892615831464497f Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 7 Dec 2010 08:57:25 -0300
Subject: [PATCH] --- yaml --- r: 232248 b: refs/heads/master c:
 eac9aa005a2e0676d07f1906f9933fd055eb1f0b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4addf200b170..9b101345bfa1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01c40c048b0f3f377e6d27b35fd99f04efcc21dd
+refs/heads/master: eac9aa005a2e0676d07f1906f9933fd055eb1f0b
diff --git a/trunk/drivers/media/video/v4l2-ctrls.c b/trunk/drivers/media/video/v4l2-ctrls.c
index 01251431fd2a..ef66d2af0c57 100644
--- a/trunk/drivers/media/video/v4l2-ctrls.c
+++ b/trunk/drivers/media/video/v4l2-ctrls.c
@@ -1352,7 +1352,7 @@ int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc)
 	qc->minimum = ctrl->minimum;
 	qc->maximum = ctrl->maximum;
 	qc->default_value = ctrl->default_value;
-	if (qc->type == V4L2_CTRL_TYPE_MENU)
+	if (ctrl->type == V4L2_CTRL_TYPE_MENU)
 		qc->step = 1;
 	else
 		qc->step = ctrl->step;