diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
commit | 93510b46df6de7db4ca3f116ac1386b24d120566 (patch) | |
tree | 8fb61f128c11c3208721db79204fb3e170c4beb6 /drivers/base/dma-mapping.c | |
parent | eb72e852c75d21ed6781027f0e3976bb7bd29f08 (diff) | |
parent | 15f82fce54b86e159fe5a1d41dcdc89e12b26459 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-15.01
Diffstat (limited to 'drivers/base/dma-mapping.c')
-rw-r--r-- | drivers/base/dma-mapping.c | 2 |
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; } |