upstream: [media] videobuf2-dma-sg: Fix typo on debug message
authorRicardo Ribalda <ricardo.ribalda@gmail.com>
Wed, 6 Nov 2013 18:48:38 +0000 (15:48 -0300)
committerChanho Park <chanho61.park@samsung.com>
Thu, 7 Aug 2014 05:26:49 +0000 (14:26 +0900)
num_pages_from_user and buf->num_pages were swapped.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Conflicts:
drivers/media/v4l2-core/videobuf2-dma-sg.c

drivers/media/v4l2-core/videobuf2-dma-sg.c

index 104e4b9..c779f21 100644 (file)
@@ -238,7 +238,7 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
 userptr_fail_alloc_table_from_pages:
 userptr_fail_get_user_pages:
        dprintk(1, "get_user_pages requested/got: %d/%d]\n",
-              num_pages_from_user, buf->num_pages);
+               buf->num_pages, num_pages_from_user);
        if (!vma_is_io(buf->vma))
                while (--num_pages_from_user >= 0)
                        put_page(buf->pages[num_pages_from_user]);