git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
videobuf2-dma-contig.c
diff --git
a/drivers/media/video/videobuf2-dma-contig.c
b/drivers/media/video/videobuf2-dma-contig.c
index
58205d5
..
a790a5f
100644
(file)
--- a/
drivers/media/video/videobuf2-dma-contig.c
+++ b/
drivers/media/video/videobuf2-dma-contig.c
@@
-46,7
+46,7
@@
static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size)
GFP_KERNEL);
if (!buf->vaddr) {
dev_err(conf->dev, "dma_alloc_coherent of size %ld failed\n",
-
buf->
size);
+ size);
kfree(buf);
return ERR_PTR(-ENOMEM);
}