The patch number 14698 was added via Douglas Schilling Landgraf 
<[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.

Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel

If anyone has any objections, please let us know by sending a message to:
        Linux Media Mailing List <[email protected]>

------

From: Hans Verkuil  <[email protected]>
v4l videobuf: remove unused is_mmapped field


Thanks to Pawel Osciak for noticing this.

Priority: normal

Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Douglas Schilling Landgraf <[email protected]>


---

 linux/drivers/media/video/videobuf-core.c |    3 ---
 linux/include/media/videobuf-core.h       |    1 -
 2 files changed, 4 deletions(-)

diff -r 7ad62393f81e -r 2237b0df9d2f linux/drivers/media/video/videobuf-core.c
--- a/linux/drivers/media/video/videobuf-core.c Mon May 10 01:54:14 2010 -0300
+++ b/linux/drivers/media/video/videobuf-core.c Mon May 10 01:57:27 2010 -0300
@@ -322,8 +322,6 @@
                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;
@@ -1090,7 +1088,6 @@
 
        mutex_lock(&q->vb_lock);
        retval = CALL(q, mmap_mapper, q, vma);
-       q->is_mmapped = 1;
        mutex_unlock(&q->vb_lock);
 
        return retval;
diff -r 7ad62393f81e -r 2237b0df9d2f linux/include/media/videobuf-core.h
--- a/linux/include/media/videobuf-core.h       Mon May 10 01:54:14 2010 -0300
+++ b/linux/include/media/videobuf-core.h       Mon May 10 01:57:27 2010 -0300
@@ -166,7 +166,6 @@
 
        unsigned int               streaming:1;
        unsigned int               reading:1;
-       unsigned int               is_mmapped:1;
 
        /* capture via mmap() + ioctl(QBUF/DQBUF) */
        struct list_head           stream;


---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/2237b0df9d2f0fc608bf5a3db3d3b04d0c59d529

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to