diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 22:23:37 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 22:23:37 -0300 |
| commit | f626beeeee212e7258b97cfbc88cb6a79a4e9e62 (patch) | |
| tree | 768a593e263d9bd1674dbc3e1b627d8a5327953c /linux/drivers/media/video/cx18 | |
| parent | e46833c20d935275819ec7699848db8bf7fc95c6 (diff) | |
| download | mediapointer-dvb-s2-f626beeeee212e7258b97cfbc88cb6a79a4e9e62.tar.gz mediapointer-dvb-s2-f626beeeee212e7258b97cfbc88cb6a79a4e9e62.tar.bz2 | |
cx18: Fix compilation and remove the obsoleted v4l2_ctrl_query_fill_std() call
From: Mauro Carvalho Chehab <mchehab@redhat.com>
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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-core.c b/linux/drivers/media/video/cx18/cx18-av-core.c index f9ca1c231..676bf4cd5 100644 --- a/linux/drivers/media/video/cx18/cx18-av-core.c +++ b/linux/drivers/media/video/cx18/cx18-av-core.c @@ -812,7 +812,7 @@ static int cx18_av_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) case V4L2_CID_CONTRAST: case V4L2_CID_SATURATION: case V4L2_CID_HUE: - return v4l2_ctrl_query_fill_std(qc); + return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0); default: break; } @@ -825,7 +825,7 @@ static int cx18_av_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 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, -128, 127, 1, 0); default: return -EINVAL; } @@ -924,11 +924,6 @@ static int cx18_av_s_stream(struct v4l2_subdev *sd, int enable) } else { cx18_av_write(cx, 0x115, 0x00); cx18_av_write(cx, 0x116, 0x00); - return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128); - return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64); - return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0); - return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0); - return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768); } return 0; } |