diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-03-14 11:18:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:58:49 -0400 |
commit | 4ff0790b6d8b26a4160e46bbd7bf6f4f48e391f9 (patch) | |
tree | a1719d76cdfd78852262faabb1cd58b49c1a96b6 /drivers/media/video/ivtv/ivtv-ioctl.c | |
parent | d37dad497c77149e99cb3f4086cfc3b8d8150135 (diff) |
V4L/DVB: ivtv: 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/ivtv/ivtv-ioctl.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index e95ebdeaa72f..a17c659e6327 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
@@ -392,7 +392,7 @@ static int ivtv_g_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo | |||
392 | return 0; | 392 | return 0; |
393 | } | 393 | } |
394 | 394 | ||
395 | v4l2_subdev_call(itv->sd_video, video, g_fmt, fmt); | 395 | v4l2_subdev_call(itv->sd_video, vbi, g_sliced_fmt, vbifmt); |
396 | vbifmt->service_set = ivtv_get_service_set(vbifmt); | 396 | vbifmt->service_set = ivtv_get_service_set(vbifmt); |
397 | return 0; | 397 | return 0; |
398 | } | 398 | } |
@@ -598,7 +598,7 @@ static int ivtv_s_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f | |||
598 | return -EBUSY; | 598 | return -EBUSY; |
599 | itv->vbi.sliced_in->service_set = 0; | 599 | itv->vbi.sliced_in->service_set = 0; |
600 | itv->vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE; | 600 | itv->vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE; |
601 | v4l2_subdev_call(itv->sd_video, video, s_fmt, fmt); | 601 | v4l2_subdev_call(itv->sd_video, vbi, s_raw_fmt, &fmt->fmt.vbi); |
602 | return ivtv_g_fmt_vbi_cap(file, fh, fmt); | 602 | return ivtv_g_fmt_vbi_cap(file, fh, fmt); |
603 | } | 603 | } |
604 | 604 | ||
@@ -616,7 +616,7 @@ static int ivtv_s_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo | |||
616 | if (ivtv_raw_vbi(itv) && atomic_read(&itv->capturing) > 0) | 616 | if (ivtv_raw_vbi(itv) && atomic_read(&itv->capturing) > 0) |
617 | return -EBUSY; | 617 | return -EBUSY; |
618 | itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE; | 618 | itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE; |
619 | v4l2_subdev_call(itv->sd_video, video, s_fmt, fmt); | 619 | v4l2_subdev_call(itv->sd_video, vbi, s_sliced_fmt, vbifmt); |
620 | memcpy(itv->vbi.sliced_in, vbifmt, sizeof(*itv->vbi.sliced_in)); | 620 | memcpy(itv->vbi.sliced_in, vbifmt, sizeof(*itv->vbi.sliced_in)); |
621 | return 0; | 621 | return 0; |
622 | } | 622 | } |