summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-17 08:43:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-17 08:43:12 -0700
commit5bb93f1a212e756834bc380682210647b5cdfcf1 (patch)
treee9628306c2158dc0a62d636e4c7ba981df0978ca /include
parente5254a625d1d3f3119d80ddc30a6e6fe64001231 (diff)
parent46c87852e99cf8ce97e207b11cde19085837e39c (diff)
downloadlinux-5bb93f1a212e756834bc380682210647b5cdfcf1.tar.bz2
Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull CMA and DMA-mapping fixes from Marek Szyprowski: "Another set of minor fixups for recently merged Contiguous Memory Allocator and ARM DMA-mapping changes. Those patches fix mysterious crashes on systems with CMA and Himem enabled as well as some corner cases caused by typical off-by-one bug." * 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: ARM: dma-mapping: modify condition check while freeing pages mm: cma: fix condition check when setting global cma area mm: cma: don't replace lowmem pages with highmem
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/dma-contiguous.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/dma-contiguous.h b/include/asm-generic/dma-contiguous.h
index c544356b374b..294b1e755ab2 100644
--- a/include/asm-generic/dma-contiguous.h
+++ b/include/asm-generic/dma-contiguous.h
@@ -18,7 +18,7 @@ static inline void dev_set_cma_area(struct device *dev, struct cma *cma)
{
if (dev)
dev->cma_area = cma;
- if (!dev || !dma_contiguous_default_area)
+ if (!dev && !dma_contiguous_default_area)
dma_contiguous_default_area = cma;
}