diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 12:06:54 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 12:06:54 -0300 |
commit | 2224352436462570837c39e7a12ed6f98a96986f (patch) | |
tree | 35270051c3b3797885309d3975b897264624c822 /linux/drivers/media/video/bt8xx/bttv-driver.c | |
parent | 2a273893a153bd7311b488785d4ced28ff9967c2 (diff) | |
parent | cf2c310a0889cdeb0bc711e69833b77007717bcd (diff) | |
download | mediapointer-dvb-s2-2224352436462570837c39e7a12ed6f98a96986f.tar.gz mediapointer-dvb-s2-2224352436462570837c39e7a12ed6f98a96986f.tar.bz2 |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-driver.c')
-rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 303422115..a836e0ed4 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -2654,7 +2654,7 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf) struct bttv_fh *fh = priv; mutex_lock(&fh->cap.vb_lock); - retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, + retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, V4L2_MEMORY_MMAP); if (retval < 0) { mutex_unlock(&fh->cap.vb_lock); |