diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-12 05:27:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-12 05:27:22 -0400 |
| commit | bb6dfb32f90094fea647e1f27d994a8b6ddd2766 (patch) | |
| tree | e63681727543bcc3251bbc82b81a9cc822cc3f5e /drivers/media/video/bt8xx/bttv-driver.c | |
| parent | 4f384f8bcdb5d618a0a68fb84c809e602c798b8f (diff) | |
| parent | 5e70b7f3c24468bb1635b295945edb48ecd9656a (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-driver.c')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 2ca3e9cfb2bb..0165aac533bf 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
| @@ -2613,7 +2613,7 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) | |||
| 2613 | struct bttv_fh *fh = priv; | 2613 | struct bttv_fh *fh = priv; |
| 2614 | 2614 | ||
| 2615 | mutex_lock(&fh->cap.vb_lock); | 2615 | mutex_lock(&fh->cap.vb_lock); |
| 2616 | retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, | 2616 | retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, |
| 2617 | V4L2_MEMORY_MMAP); | 2617 | V4L2_MEMORY_MMAP); |
| 2618 | if (retval < 0) { | 2618 | if (retval < 0) { |
| 2619 | mutex_unlock(&fh->cap.vb_lock); | 2619 | mutex_unlock(&fh->cap.vb_lock); |