From 0775f7f480d8f935ff8488f49eddabbdf938f4ef Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 16 Jan 2011 11:21:40 -0300
Subject: [PATCH] --- yaml --- r: 232244 b: refs/heads/master c:
 829fb2dcb5252c5064d12cdaf65d2828420e07b3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e39cceb27373..5489bad997aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c959acfddb3d24ecfdae1a280a7a1785d9df81d1
+refs/heads/master: 829fb2dcb5252c5064d12cdaf65d2828420e07b3
diff --git a/trunk/drivers/media/video/v4l2-ctrls.c b/trunk/drivers/media/video/v4l2-ctrls.c
index 22a9a722f520..01251431fd2a 100644
--- a/trunk/drivers/media/video/v4l2-ctrls.c
+++ b/trunk/drivers/media/video/v4l2-ctrls.c
@@ -1344,7 +1344,10 @@ int v4l2_queryctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_queryctrl *qc)
 
 	ctrl = ref->ctrl;
 	memset(qc, 0, sizeof(*qc));
-	qc->id = ctrl->id;
+	if (id >= V4L2_CID_PRIVATE_BASE)
+		qc->id = id;
+	else
+		qc->id = ctrl->id;
 	strlcpy(qc->name, ctrl->name, sizeof(qc->name));
 	qc->minimum = ctrl->minimum;
 	qc->maximum = ctrl->maximum;