---

yaml --- r: 193022 b: refs/heads/master c: 63e4248 h: refs/heads/master v: v3
git-mirror · May 19, 2010 · 4c0e69e · 4c0e69e
1 parent 496b3e2
commit 4c0e69e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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
@@ -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;