aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-03-28 06:59:11 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:57:51 -0400
commit63e424856b4ab0652c58f75a2d2ecb9c1f95db27 (patch)
tree43df346d9717932f3b7c28b60957dfb3b6d8ca87
parent53aaf07637baae8f53c33b803bbc96047d8da1c4 (diff)
V4L/DVB: v4l videobuf: remove unused is_mmapped field
Thanks to Pawel Osciak for noticing this. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/videobuf-core.c3
-rw-r--r--include/media/videobuf-core.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 52bb74b18a68..d76a7d500029 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -321,8 +321,6 @@ static int __videobuf_mmap_free(struct videobuf_queue *q)
321 if (q->bufs[i] && q->bufs[i]->map) 321 if (q->bufs[i] && q->bufs[i]->map)
322 return -EBUSY; 322 return -EBUSY;
323 323
324 q->is_mmapped = 0;
325
326 for (i = 0; i < VIDEO_MAX_FRAME; i++) { 324 for (i = 0; i < VIDEO_MAX_FRAME; i++) {
327 if (NULL == q->bufs[i]) 325 if (NULL == q->bufs[i])
328 continue; 326 continue;
@@ -1089,7 +1087,6 @@ int videobuf_mmap_mapper(struct videobuf_queue *q, struct vm_area_struct *vma)
1089 1087
1090 mutex_lock(&q->vb_lock); 1088 mutex_lock(&q->vb_lock);
1091 retval = CALL(q, mmap_mapper, q, vma); 1089 retval = CALL(q, mmap_mapper, q, vma);
1092 q->is_mmapped = 1;
1093 mutex_unlock(&q->vb_lock); 1090 mutex_unlock(&q->vb_lock);
1094 1091
1095 return retval; 1092 return retval;
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 345ec5a45c55..22d5a02884ad 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -166,7 +166,6 @@ struct videobuf_queue {
166 166
167 unsigned int streaming:1; 167 unsigned int streaming:1;
168 unsigned int reading:1; 168 unsigned int reading:1;
169 unsigned int is_mmapped:1;
170 169
171 /* capture via mmap() + ioctl(QBUF/DQBUF) */ 170 /* capture via mmap() + ioctl(QBUF/DQBUF) */
172 struct list_head stream; 171 struct list_head stream;