diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-05-01 11:28:20 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 14:58:39 -0300 |
| commit | fca3469aa844e2ae993445aa5f41397003199be7 (patch) | |
| tree | 84484f23df213f2c2ff147536639f6f43106e06c /drivers/media/common/saa7146_video.c | |
| parent | fd74d6eb4c2c1caa18208df32d9d38b5fe9738fc (diff) | |
[media] saa7146: move vbi fields from saa7146_fh to saa7146_vv
This fields are global and don't belong in a fh struct.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/saa7146_video.c')
| -rw-r--r-- | drivers/media/common/saa7146_video.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index f57dccf851c..9a99835e1e4 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c @@ -613,7 +613,10 @@ static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh, struct v4l2_for static int vidioc_g_fmt_vbi_cap(struct file *file, void *fh, struct v4l2_format *f) { - f->fmt.vbi = ((struct saa7146_fh *)fh)->vbi_fmt; + struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; + struct saa7146_vv *vv = dev->vv_data; + + f->fmt.vbi = vv->vbi_fmt; return 0; } |