[media] videobuf2-core: fix a warning at vb2
authorMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 30 Dec 2011 18:10:44 +0000 (16:10 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 30 Dec 2011 18:12:43 +0000 (16:12 -0200)
It seems that a cut-and-past error were added by the last patch:

drivers/media/video/videobuf2-core.c: In function ‘vb2_qbuf’:
drivers/media/video/videobuf2-core.c:1099:14: warning: comparison between ‘enum v4l2_buf_type’ and ‘enum v4l2_memory’ [-Wenum-compare]

On all places V4L2_MEMORY_USERPTR is used, it is associated with
q->memory, and not b->type. So, the fix seems obvious.

Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/videobuf2-core.c

index 26cfbf5..2e8f1df 100644 (file)
@@ -1096,7 +1096,7 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
         * beggining of qbuf processing. This way the queue status is
         * consistent after getting driver's lock back.
         */
-       if (b->type == V4L2_MEMORY_USERPTR) {
+       if (q->memory == V4L2_MEMORY_USERPTR) {
                mmap_sem = &current->mm->mmap_sem;
                call_qop(q, wait_prepare, q);
                down_read(mmap_sem);