diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-03-14 11:24:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:58:50 -0400 |
commit | add632cd2580ceb4de9f71ab58c658e9bdebd7f7 (patch) | |
tree | 3290b7f900af6ed8e4c21b1a4ee8f762b5f4dd65 /drivers/media/video/cx18/cx18-ioctl.c | |
parent | 4ff0790b6d8b26a4160e46bbd7bf6f4f48e391f9 (diff) |
V4L/DVB: cx18: switch to new vbi subdev ops
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-ioctl.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c index b81dd0ea8eb..2e6addab3ed 100644 --- a/drivers/media/video/cx18/cx18-ioctl.c +++ b/drivers/media/video/cx18/cx18-ioctl.c | |||
@@ -208,7 +208,7 @@ static int cx18_g_fmt_sliced_vbi_cap(struct file *file, void *fh, | |||
208 | * digitizer/slicer. Note, cx18_av_vbi() wipes the passed in | 208 | * digitizer/slicer. Note, cx18_av_vbi() wipes the passed in |
209 | * fmt->fmt.sliced under valid calling conditions | 209 | * fmt->fmt.sliced under valid calling conditions |
210 | */ | 210 | */ |
211 | if (v4l2_subdev_call(cx->sd_av, video, g_fmt, fmt)) | 211 | if (v4l2_subdev_call(cx->sd_av, vbi, g_sliced_fmt, &fmt->fmt.sliced)) |
212 | return -EINVAL; | 212 | return -EINVAL; |
213 | 213 | ||
214 | /* Ensure V4L2 spec compliant output */ | 214 | /* Ensure V4L2 spec compliant output */ |
@@ -322,7 +322,7 @@ static int cx18_s_fmt_vbi_cap(struct file *file, void *fh, | |||
322 | * Note cx18_av_vbi_wipes out alot of the passed in fmt under valid | 322 | * Note cx18_av_vbi_wipes out alot of the passed in fmt under valid |
323 | * calling conditions | 323 | * calling conditions |
324 | */ | 324 | */ |
325 | ret = v4l2_subdev_call(cx->sd_av, video, s_fmt, fmt); | 325 | ret = v4l2_subdev_call(cx->sd_av, vbi, s_raw_fmt, &fmt->fmt.vbi); |
326 | if (ret) | 326 | if (ret) |
327 | return ret; | 327 | return ret; |
328 | 328 | ||
@@ -359,7 +359,7 @@ static int cx18_s_fmt_sliced_vbi_cap(struct file *file, void *fh, | |||
359 | * Note, cx18_av_vbi() wipes some "impossible" service lines in the | 359 | * Note, cx18_av_vbi() wipes some "impossible" service lines in the |
360 | * passed in fmt->fmt.sliced under valid calling conditions | 360 | * passed in fmt->fmt.sliced under valid calling conditions |
361 | */ | 361 | */ |
362 | ret = v4l2_subdev_call(cx->sd_av, video, s_fmt, fmt); | 362 | ret = v4l2_subdev_call(cx->sd_av, vbi, s_sliced_fmt, &fmt->fmt.sliced); |
363 | if (ret) | 363 | if (ret) |
364 | return ret; | 364 | return ret; |
365 | /* Store our current v4l2 sliced VBI settings */ | 365 | /* Store our current v4l2 sliced VBI settings */ |