diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-10 05:33:03 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:04:46 -0500 |
commit | d05051c82e0e8ff748e9c9a06a061bda3ad656e5 (patch) | |
tree | 8c16254c217b301b60519136bc12618de3894a2e /include/media | |
parent | c6243d9c3de82e46467c88898db45ca14b6843a0 (diff) |
V4L/DVB (6997): Replace a very dirty hack on videobuf for a clean wait_event
In order to videobuf_iolock to work, mmap_mapper should be called first.
Otherwise, an OOPS is generated.
On some cases, .mmap file handler used to took some time to be called. On those
situations, mmap_mmapper() were called after iolock.
This patch properly waits for mmap_mapper to be called, otherwise generating an
error.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/videobuf-core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 7aa7a7b64c1b..97f14d469595 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h | |||
@@ -164,6 +164,8 @@ struct videobuf_queue { | |||
164 | 164 | ||
165 | unsigned int streaming:1; | 165 | unsigned int streaming:1; |
166 | unsigned int reading:1; | 166 | unsigned int reading:1; |
167 | unsigned int is_mmapped:1; | ||
168 | |||
167 | /* capture via mmap() + ioctl(QBUF/DQBUF) */ | 169 | /* capture via mmap() + ioctl(QBUF/DQBUF) */ |
168 | struct list_head stream; | 170 | struct list_head stream; |
169 | 171 | ||