From 4c0e69ec09170124523e955620d315b570280cce Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 28 Mar 2010 07:59:11 -0300 Subject: [PATCH] --- yaml --- r: 193022 b: refs/heads/master c: 63e424856b4ab0652c58f75a2d2ecb9c1f95db27 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-core.c | 3 --- trunk/include/media/videobuf-core.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6531d387532f..9a98df578d1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53aaf07637baae8f53c33b803bbc96047d8da1c4 +refs/heads/master: 63e424856b4ab0652c58f75a2d2ecb9c1f95db27 diff --git a/trunk/drivers/media/video/videobuf-core.c b/trunk/drivers/media/video/videobuf-core.c index 52bb74b18a68..d76a7d500029 100644 --- a/trunk/drivers/media/video/videobuf-core.c +++ b/trunk/drivers/media/video/videobuf-core.c @@ -321,8 +321,6 @@ static int __videobuf_mmap_free(struct videobuf_queue *q) if (q->bufs[i] && q->bufs[i]->map) return -EBUSY; - q->is_mmapped = 0; - for (i = 0; i < VIDEO_MAX_FRAME; i++) { if (NULL == q->bufs[i]) continue; @@ -1089,7 +1087,6 @@ int videobuf_mmap_mapper(struct videobuf_queue *q, struct vm_area_struct *vma) mutex_lock(&q->vb_lock); retval = CALL(q, mmap_mapper, q, vma); - q->is_mmapped = 1; mutex_unlock(&q->vb_lock); return retval; diff --git a/trunk/include/media/videobuf-core.h b/trunk/include/media/videobuf-core.h index 345ec5a45c55..22d5a02884ad 100644 --- a/trunk/include/media/videobuf-core.h +++ b/trunk/include/media/videobuf-core.h @@ -166,7 +166,6 @@ 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;