From 5833c3008e2af600dd075958bab5214edde577fc Mon Sep 17 00:00:00 2001 From: Andrzej Pietrasiewicz Date: Fri, 28 Jan 2011 09:42:51 -0300 Subject: [PATCH] --- yaml --- r: 242069 b: refs/heads/master c: a9bb36aa0d6547aa0ab3d5cfde08e8651bd460bc h: refs/heads/master i: 242067: 3dfab4c3c6707932da3a34eb4cc1cc52341f3dd6 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf2-dma-sg.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a5d40f4beed4..16e418fc126e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29e3fbd8edb31549fa8302c185bd0b915a43d8b8 +refs/heads/master: a9bb36aa0d6547aa0ab3d5cfde08e8651bd460bc diff --git a/trunk/drivers/media/video/videobuf2-dma-sg.c b/trunk/drivers/media/video/videobuf2-dma-sg.c index 20b5c5dcc0ef..d5311ff3fab0 100644 --- a/trunk/drivers/media/video/videobuf2-dma-sg.c +++ b/trunk/drivers/media/video/videobuf2-dma-sg.c @@ -88,6 +88,7 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size) fail_pages_alloc: while (--i >= 0) __free_page(buf->pages[i]); + kfree(buf->pages); fail_pages_array_alloc: vfree(buf->sg_desc.sglist); @@ -176,6 +177,7 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr, num_pages_from_user, buf->sg_desc.num_pages); while (--num_pages_from_user >= 0) put_page(buf->pages[num_pages_from_user]); + kfree(buf->pages); userptr_fail_pages_array_alloc: vfree(buf->sg_desc.sglist);