From 34b7db23463a1cdd72a623463175ec30594a693b Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Wed, 2 Sep 2009 22:23:23 -0300 Subject: [PATCH] --- yaml --- r: 164071 b: refs/heads/master c: 91f6dcec929b37a4568ddf55ef84e007d8fccc34 h: refs/heads/master i: 164069: d4aee0f59d8f31cc53778f8289e95c193aca16ee 164067: a17bfece1e21145ea2f6337b567891d0b48a070f 164063: 5fe971af93af2874a10877c52c76e0cfd27fcc3a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-video.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6d57ffecc866..cc14547953ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28abf083d356bc4ec459ded7a95b6a22a20f6c3d +refs/heads/master: 91f6dcec929b37a4568ddf55ef84e007d8fccc34 diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index 7022f7ba61bb..55bc8ea56094 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/drivers/media/video/em28xx/em28xx-video.c @@ -2303,7 +2303,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,