From 0c71e2f4f6f7a0fc5feb88136d906b8bf8f71f7f Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 14 Mar 2010 12:39:27 -0300 Subject: [PATCH] --- yaml --- r: 193121 b: refs/heads/master c: 4a61ecbd344c2349ec3b7a8db0db128135285dd7 h: refs/heads/master i: 193119: b5ab52f5fb529d7752bfbd4fe14d95f6c524ff1f v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-video.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 83e89d2cd690..e766ca8ea9ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e87ddb101caa747edf388220c758c99553566f5 +refs/heads/master: 4a61ecbd344c2349ec3b7a8db0db128135285dd7 diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index b6ac99de97d2..8565fb3ff945 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/drivers/media/video/em28xx/em28xx-video.c @@ -1831,7 +1831,7 @@ static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv, mutex_lock(&dev->lock); f->fmt.sliced.service_set = 0; - v4l2_device_call_all(&dev->v4l2_dev, 0, video, g_fmt, f); + v4l2_device_call_all(&dev->v4l2_dev, 0, vbi, g_sliced_fmt, &f->fmt.sliced); if (f->fmt.sliced.service_set == 0) rc = -EINVAL; @@ -1853,7 +1853,7 @@ static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv, return rc; mutex_lock(&dev->lock); - v4l2_device_call_all(&dev->v4l2_dev, 0, video, g_fmt, f); + v4l2_device_call_all(&dev->v4l2_dev, 0, vbi, g_sliced_fmt, &f->fmt.sliced); mutex_unlock(&dev->lock); if (f->fmt.sliced.service_set == 0)