aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videobuf-core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-09-27 17:25:44 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 23:02:55 -0400
commit851c0c96b2212f48fe51afc1589541b5eae3a544 (patch)
tree0ec4d6019033242fb75e717ca05c1f04d2eca934 /drivers/media/video/videobuf-core.c
parentcd4765efdd816ac14075fc7d5adf489502e75e1e (diff)
V4L/DVB (6266): videobuf cleanup: mmap check is common to all videobuf. Make it at core
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> http://thread.gmane.org/gmane.comp.video.video4linux/34978/focus=34981 Reviewed-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'drivers/media/video/videobuf-core.c')
-rw-r--r--drivers/media/video/videobuf-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index eb3b98400c1..3bd06bb633a 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -149,7 +149,7 @@ int videobuf_queue_is_busy(struct videobuf_queue *q)
149 for (i = 0; i < VIDEO_MAX_FRAME; i++) { 149 for (i = 0; i < VIDEO_MAX_FRAME; i++) {
150 if (NULL == q->bufs[i]) 150 if (NULL == q->bufs[i])
151 continue; 151 continue;
152 if (CALL(q,is_mmapped,q->bufs[i])) { 152 if (q->bufs[i]->map) {
153 dprintk(1,"busy: buffer #%d mapped\n",i); 153 dprintk(1,"busy: buffer #%d mapped\n",i);
154 return 1; 154 return 1;
155 } 155 }
@@ -238,7 +238,7 @@ static void videobuf_status(struct videobuf_queue *q, struct v4l2_buffer *b,
238 } 238 }
239 239
240 b->flags = 0; 240 b->flags = 0;
241 if (CALL(q,is_mmapped,vb)) 241 if (vb->map)
242 b->flags |= V4L2_BUF_FLAG_MAPPED; 242 b->flags |= V4L2_BUF_FLAG_MAPPED;
243 243
244 switch (vb->state) { 244 switch (vb->state) {