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 ../torvalds-2.6/
[pandora-kernel.git]
/
drivers
/
media
/
video
/
video-buf.c
diff --git
a/drivers/media/video/video-buf.c
b/drivers/media/video/video-buf.c
index
97354f2
..
574b8e3
100644
(file)
--- a/
drivers/media/video/video-buf.c
+++ b/
drivers/media/video/video-buf.c
@@
-267,10
+267,10
@@
int videobuf_dma_free(struct videobuf_dmabuf *dma)
kfree(dma->pages);
dma->pages = NULL;
}
- if (dma->vmalloc) {
-
vfree(dma->vmalloc);
-
dma->vmalloc = NULL;
- }
+
+ vfree(dma->vmalloc);
+ dma->vmalloc = NULL;
+
if (dma->bus_addr) {
dma->bus_addr = 0;
}