From 38a140686719d5615fca0dd87c9db6f5ac20c443 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 10 Jan 2008 07:33:03 -0300
Subject: [PATCH] --- yaml --- r: 76720 b: refs/heads/master c:
 d05051c82e0e8ff748e9c9a06a061bda3ad656e5 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/video/videobuf-core.c | 15 +++++++++++----
 trunk/include/media/videobuf-core.h       |  2 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d43837709182..90ccac6064d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6243d9c3de82e46467c88898db45ca14b6843a0
+refs/heads/master: d05051c82e0e8ff748e9c9a06a061bda3ad656e5
diff --git a/trunk/drivers/media/video/videobuf-core.c b/trunk/drivers/media/video/videobuf-core.c
index 43fe3f78c8df..c3adbd686ffe 100644
--- a/trunk/drivers/media/video/videobuf-core.c
+++ b/trunk/drivers/media/video/videobuf-core.c
@@ -98,13 +98,15 @@ int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
 	MAGIC_CHECK(vb->magic, MAGIC_BUFFER);
 	MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
 
-	/* FIXME: This is required to avoid OOPS on some cases,
+	/* This is required to avoid OOPS on some cases,
 	   since mmap_mapper() method should be called before _iolock.
 	   On some cases, the mmap_mapper() is called only after scheduling.
-
-	   However, this way is just too dirty! Better to wait for some event.
 	 */
-	schedule_timeout(HZ);
+	wait_event_timeout(vb->done, q->is_mmapped, msecs_to_jiffies(100));
+	if (!q->is_mmapped) {
+		printk(KERN_ERR "Error: mmap_mapper() never called!\n");
+		return -EINVAL;
+	}
 
 	return CALL(q, iolock, q, vb, fbuf);
 }
@@ -300,7 +302,11 @@ static int __videobuf_mmap_free(struct videobuf_queue *q)
 
 	MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
 
+
 	rc  = CALL(q, mmap_free, q);
+
+	q->is_mmapped = 0;
+
 	if (rc < 0)
 		return rc;
 
@@ -1022,6 +1028,7 @@ int videobuf_mmap_mapper(struct videobuf_queue *q,
 
 	mutex_lock(&q->lock);
 	retval = CALL(q, mmap_mapper, q, vma);
+	q->is_mmapped = 1;
 	mutex_unlock(&q->lock);
 
 	return retval;
diff --git a/trunk/include/media/videobuf-core.h b/trunk/include/media/videobuf-core.h
index 7aa7a7b64c1b..97f14d469595 100644
--- a/trunk/include/media/videobuf-core.h
+++ b/trunk/include/media/videobuf-core.h
@@ -164,6 +164,8 @@ 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;