diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-13 11:54:05 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-13 11:54:05 -0300 |
| commit | e0c1e01aabf66d47f4903f4b6d439258faa880af (patch) | |
| tree | 56b929b9b2c84600013402605895118014460fef /linux/include | |
| parent | a294f171dfaa690aaecc84009fb6e35d4df5d7bf (diff) | |
| download | mediapointer-dvb-s2-e0c1e01aabf66d47f4903f4b6d439258faa880af.tar.gz mediapointer-dvb-s2-e0c1e01aabf66d47f4903f4b6d439258faa880af.tar.bz2 | |
videobuf: revert changeset #7490:5b77f099a151
From: Mauro Carvalho Chehab <mchehab@infradead.org>
This changeset were supposed to optimize mmap() support on vmalloc. However, it
just broke mmap() on real devices. Revert the changeset to make mmap() to work
again.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/videobuf-core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h index 18b0ba615..ea269cec4 100644 --- a/linux/include/media/videobuf-core.h +++ b/linux/include/media/videobuf-core.h @@ -144,8 +144,6 @@ struct videobuf_qtype_ops { int vbihack, int nonblocking); int (*mmap_free) (struct videobuf_queue *q); - int (*mmap_setup) (struct videobuf_queue *q, - struct videobuf_buffer *vb); int (*mmap_mapper) (struct videobuf_queue *q, struct vm_area_struct *vma); }; @@ -172,6 +170,7 @@ struct videobuf_queue { unsigned int streaming:1; unsigned int reading:1; + unsigned int is_mmapped:1; /* capture via mmap() + ioctl(QBUF/DQBUF) */ struct list_head stream; |