---

yaml --- r: 242069 b: refs/heads/master c: a9bb36a h: refs/heads/master i: 242067: 3dfab4c v: v3
git-mirror · Mar 22, 2011 · 5833c30 · 5833c30
1 parent bdb6c60
commit 5833c30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);