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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[pandora-kernel.git]
/
arch
/
arm
/
common
/
dmabounce.c
diff --git
a/arch/arm/common/dmabounce.c
b/arch/arm/common/dmabounce.c
index
dd29473
..
69130f3
100644
(file)
--- a/
arch/arm/common/dmabounce.c
+++ b/
arch/arm/common/dmabounce.c
@@
-280,7
+280,7
@@
unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
/*
* Trying to unmap an invalid mapping
*/
- if (dma_mapping_error(dma_addr)) {
+ if (dma_mapping_error(d
ev, d
ma_addr)) {
dev_err(dev, "Trying to unmap invalid mapping\n");
return;
}