aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-03-14 11:39:27 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:58:51 -0400
commit4a61ecbd344c2349ec3b7a8db0db128135285dd7 (patch)
tree23f81b454786fbf4924e2c6b6a79b51522fc2692 /drivers/media/video
parent7e87ddb101caa747edf388220c758c99553566f5 (diff)
V4L/DVB: em28xx: 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')
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index b6ac99de97d2..8565fb3ff945 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1831,7 +1831,7 @@ static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv,
1831 mutex_lock(&dev->lock); 1831 mutex_lock(&dev->lock);
1832 1832
1833 f->fmt.sliced.service_set = 0; 1833 f->fmt.sliced.service_set = 0;
1834 v4l2_device_call_all(&dev->v4l2_dev, 0, video, g_fmt, f); 1834 v4l2_device_call_all(&dev->v4l2_dev, 0, vbi, g_sliced_fmt, &f->fmt.sliced);
1835 1835
1836 if (f->fmt.sliced.service_set == 0) 1836 if (f->fmt.sliced.service_set == 0)
1837 rc = -EINVAL; 1837 rc = -EINVAL;
@@ -1853,7 +1853,7 @@ static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv,
1853 return rc; 1853 return rc;
1854 1854
1855 mutex_lock(&dev->lock); 1855 mutex_lock(&dev->lock);
1856 v4l2_device_call_all(&dev->v4l2_dev, 0, video, g_fmt, f); 1856 v4l2_device_call_all(&dev->v4l2_dev, 0, vbi, g_sliced_fmt, &f->fmt.sliced);
1857 mutex_unlock(&dev->lock); 1857 mutex_unlock(&dev->lock);
1858 1858
1859 if (f->fmt.sliced.service_set == 0) 1859 if (f->fmt.sliced.service_set == 0)