diff options
| author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2009-09-02 21:23:23 -0400 |
|---|---|---|
| committer | Devin Heitmueller <dheitmueller@kernellabs.com> | 2009-09-02 21:23:23 -0400 |
| commit | 4acaf41f8f45a4b7c2403f979ffa23330ada7edf (patch) | |
| tree | 8cdbfac31d7c8c863b1f4fe1be0c1b49ea24f4d3 | |
| parent | a5ed985ed0158950f8d037331fa29710db72831c (diff) | |
| download | mediapointer-dvb-s2-4acaf41f8f45a4b7c2403f979ffa23330ada7edf.tar.gz mediapointer-dvb-s2-4acaf41f8f45a4b7c2403f979ffa23330ada7edf.tar.bz2 | |
em28xx: fix mmap_mapper with vbi
From: Devin Heitmueller <dheitmueller@kernellabs.com>
When adding support for both video and VBI, I missed the mmap ioctl. Add
the missing call.
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index 449fec8f8..a9b859959 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -2354,7 +2354,10 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma) if (unlikely(rc < 0)) return rc; - rc = videobuf_mmap_mapper(&fh->vb_vidq, vma); + if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) + rc = videobuf_mmap_mapper(&fh->vb_vidq, vma); + else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) + rc = videobuf_mmap_mapper(&fh->vb_vbiq, vma); em28xx_videodbg("vma start=0x%08lx, size=%ld, ret=%d\n", (unsigned long)vma->vm_start, |