The patch number 12743 was added via Devin Heitmueller 
<dheitmuel...@kernellabs.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        Linux Media Mailing List <linux-me...@vger.kernel.org>

------

From: Devin Heitmueller  <dheitmuel...@kernellabs.com>
em28xx: fix mmap_mapper with vbi


When adding support for both video and VBI, I missed the mmap ioctl.  Add
the missing call.

Priority: normal

Signed-off-by: Devin Heitmueller <dheitmuel...@kernellabs.com>


---

 linux/drivers/media/video/em28xx/em28xx-video.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff -r deb9b843ca3a -r 3da47fe41968 
linux/drivers/media/video/em28xx/em28xx-video.c
--- a/linux/drivers/media/video/em28xx/em28xx-video.c   Tue Sep 01 00:54:54 
2009 -0400
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c   Wed Sep 02 21:23:23 
2009 -0400
@@ -2354,7 +2354,10 @@
        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,


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/3da47fe4196838b49bc0ecfbe73fb57256489151

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to