aboutsummaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-01-23 20:36:05 +0000
committerMark Brown <broonie@kernel.org>2015-01-23 20:36:05 +0000
commit15f82fce54b86e159fe5a1d41dcdc89e12b26459 (patch)
treec42632581244e8428e0623c5f11cd81b983d2eed /drivers/base
parentf1326e0892329b0d58dec467f71f5d94c4d5d5a9 (diff)
parent9698ac7c353d6f22100c9fa24a830cae6a466cb4 (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsklsk-v3.10-15.01
Conflicts: arch/arm64/include/asm/proc-fns.h arch/arm64/kernel/debug-monitors.c arch/arm64/kernel/psci.c
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dma-mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index 9c36ca9ed1dd..dd302ea3b599 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -287,7 +287,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
area->pages = pages;
- if (map_vm_area(area, prot, pages)) {
+ if (map_vm_area(area, prot, &pages)) {
vunmap(area->addr);
return NULL;
}