1 files changed, 46 insertions, 13 deletions

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 8d5cf474b68e..fe147e3aaa70 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -327,6 +327,51 @@ static struct cx88_ctrl cx8800_ctls[] = {
 };
 static const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls);
 
+const u32 cx88_user_ctrls[] = {
+        V4L2_CID_USER_CLASS,
+        V4L2_CID_BRIGHTNESS,
+        V4L2_CID_CONTRAST,
+        V4L2_CID_SATURATION,
+        V4L2_CID_HUE,
+        V4L2_CID_AUDIO_VOLUME,
+        V4L2_CID_AUDIO_BALANCE,
+        V4L2_CID_AUDIO_MUTE,
+        0
+};
+EXPORT_SYMBOL(cx88_user_ctrls);
+
+static const u32 *ctrl_classes[] = {
+        cx88_user_ctrls,
+        NULL
+};
+
+int cx8800_ctrl_query(struct v4l2_queryctrl *qctrl)
+{
+        int i;
+
+        if (qctrl->id < V4L2_CID_BASE ||
+            qctrl->id >= V4L2_CID_LASTP1)
+                return -EINVAL;
+        for (i = 0; i < CX8800_CTLS; i++)
+                if (cx8800_ctls[i].v.id == qctrl->id)
+                        break;
+        if (i == CX8800_CTLS) {
+                *qctrl = no_ctl;
+                return 0;
+        }
+        *qctrl = cx8800_ctls[i].v;
+        return 0;
+}
+EXPORT_SYMBOL(cx8800_ctrl_query);
+
+static int cx88_queryctrl(struct v4l2_queryctrl *qctrl)
+{
+        qctrl->id = v4l2_ctrl_next(ctrl_classes, qctrl->id);
+        if (qctrl->id == 0)
+                return -EINVAL;
+        return cx8800_ctrl_query(qctrl);
+}
+
 /* ------------------------------------------------------------------- */
 /* resource management                                                 */
 
@@ -1362,20 +1407,8 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
         case VIDIOC_QUERYCTRL:
         {
                 struct v4l2_queryctrl *c = arg;
-                int i;
 
-                if (c->id <  V4L2_CID_BASE ||
-                    c->id >= V4L2_CID_LASTP1)
-                        return -EINVAL;
-                for (i = 0; i < CX8800_CTLS; i++)
-                        if (cx8800_ctls[i].v.id == c->id)
-                                break;
-                if (i == CX8800_CTLS) {
-                        *c = no_ctl;
-                        return 0;
-                }
-                *c = cx8800_ctls[i].v;
-                return 0;
+                return cx88_queryctrl(c);
         }
         case VIDIOC_G_CTRL:
                 return get_control(core,arg);