From 92df7d7f966f44b31b2e83453907636b8192b90b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 13 Jan 2008 19:40:30 -0300 Subject: [PATCH] --- yaml --- r: 76739 b: refs/heads/master c: 1f8d30083abc17897b897787c39d446eb9d99fe0 h: refs/heads/master i: 76737: 39693d4e818defc4d8208b90bfdf8526ae9fcc57 76735: e2597d1f53486a8a922952aa9ba4056a95cc2a6d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-core.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 122cf472ece1..2da5e7204aad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfd8c04ec14b88bc2849e62d6ff9e36f31352b60 +refs/heads/master: 1f8d30083abc17897b897787c39d446eb9d99fe0 diff --git a/trunk/drivers/media/video/videobuf-core.c b/trunk/drivers/media/video/videobuf-core.c index c3adbd686ffe..80a14da9acef 100644 --- a/trunk/drivers/media/video/videobuf-core.c +++ b/trunk/drivers/media/video/videobuf-core.c @@ -102,10 +102,14 @@ int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb, since mmap_mapper() method should be called before _iolock. On some cases, the mmap_mapper() is called only after scheduling. */ - 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; + if (vb->memory == V4L2_MEMORY_MMAP) { + 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);