From 070cf4349028fbd8441f20f426e8f92fc1a722da Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 5 Sep 2012 12:27:19 -0300 Subject: [PATCH] --- yaml --- r: 331218 b: refs/heads/master c: c5c46f26591e2c77fa9b78fac202db90428762b0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/ivtv/ivtv-ioctl.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 60448ff0c746..27c3c1daf66b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dff274fd86e401880d2d10c1dd7fa1fcb6d2bdbc +refs/heads/master: c5c46f26591e2c77fa9b78fac202db90428762b0 diff --git a/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c b/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c index 5537c8842075..3b32518dbc02 100644 --- a/trunk/drivers/media/pci/ivtv/ivtv-ioctl.c +++ b/trunk/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; }