From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 6 Jul 2012 10:02:04 +0000 (+0200)
Subject: mm: cma: fix condition check when setting global cma area
X-Git-Tag: upstream/snapshot3+hdmi~7068^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc2caea5b6152b8ce66dc2bbe83dc72b60612da8;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

mm: cma: fix condition check when setting global cma area

dev_set_cma_area incorrectly assigned cma to global area on first call
due to incorrect check. This patch fixes this issue.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---

diff --git a/include/asm-generic/dma-contiguous.h b/include/asm-generic/dma-contiguous.h
index c544356..294b1e7 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;
 }