aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/pci/ivtv
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-05 12:27:19 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-01 17:22:40 -0300
commitc5c46f26591e2c77fa9b78fac202db90428762b0 (patch)
tree5ffc22efdde8842dc4488e86eedd6720baa8c57d /drivers/media/pci/ivtv
parentdff274fd86e401880d2d10c1dd7fa1fcb6d2bdbc (diff)
downloadvexpress-lsk-c5c46f26591e2c77fa9b78fac202db90428762b0.tar.gz
[media] ivtv: fix incorrect service_set for the decoder VBI capture
Found with v4l2-compliance. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/ivtv')
-rw-r--r--drivers/media/pci/ivtv/ivtv-ioctl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 5537c884207..3b32518dbc0 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -398,6 +398,7 @@ static int ivtv_g_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_fo
vbifmt->service_set = itv->is_50hz ? V4L2_SLICED_VBI_625 :
V4L2_SLICED_VBI_525;
ivtv_expand_service_set(vbifmt, itv->is_50hz);
+ vbifmt->service_set = ivtv_get_service_set(vbifmt);
return 0;
}