V4L/DVB (10698): v4l2-common: remove v4l2_ctrl_query_fill_std

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx18 / cx18-av-core.c

diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c
index a3bd2c95f582d91bbfb8b7c3fd45f0593a151fb2..fc576cf1a8b596d7e3d7df3d219013024489a9f5 100644 (file)
--- a/drivers/media/video/cx18/cx18-av-core.c
+++ b/drivers/media/video/cx18/cx18-av-core.c
@@ -788,10 +788,12 @@ int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg)
 
                switch (qc->id) {
                case V4L2_CID_BRIGHTNESS:
+                       return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);
                case V4L2_CID_CONTRAST:
                case V4L2_CID_SATURATION:
+                       return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);
                case V4L2_CID_HUE:
-                       return v4l2_ctrl_query_fill_std(qc);
+                       return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);
                default:
                        break;
                }
@@ -801,10 +803,11 @@ int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg)
                        return v4l2_ctrl_query_fill(qc, 0, 65535,
                                65535 / 100, state->default_volume);
                case V4L2_CID_AUDIO_MUTE:
+                       return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);
                case V4L2_CID_AUDIO_BALANCE:
                case V4L2_CID_AUDIO_BASS:
                case V4L2_CID_AUDIO_TREBLE:
-                       return v4l2_ctrl_query_fill_std(qc);
+                       return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);
                default:
                        return -EINVAL;
                }