diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-27 00:08:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-27 00:08:39 -0300 |
| commit | 51f6ffe21ba00a15a58bc5a424600130a371e3fe (patch) | |
| tree | a417e03d2717f7096b8408cbe62451385ca988a5 /linux/drivers/media/video/cx18 | |
| parent | 651832517bf84c433af2ced6ce2aa666d59f6e96 (diff) | |
| download | mediapointer-dvb-s2-51f6ffe21ba00a15a58bc5a424600130a371e3fe.tar.gz mediapointer-dvb-s2-51f6ffe21ba00a15a58bc5a424600130a371e3fe.tar.bz2 | |
cx18 and saa7110: remove the fake v4l2_ctrl_query_fill calls for the proper ones
From: Mauro Carvalho Chehab <mchehab@redhat.com>
During the patch merge, I've added a temporary fix for v4l2_ctrl_query_fill(),
just to avoid the tree breakage. Replace those for the proper values.
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-av-core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-core.c b/linux/drivers/media/video/cx18/cx18-av-core.c index 676bf4cd5..cf256a999 100644 --- a/linux/drivers/media/video/cx18/cx18-av-core.c +++ b/linux/drivers/media/video/cx18/cx18-av-core.c @@ -809,8 +809,10 @@ static int cx18_av_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 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(qc, -128, 127, 1, 0); default: @@ -822,10 +824,11 @@ static int cx18_av_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 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(qc, -128, 127, 1, 0); + return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768); default: return -EINVAL; } |