From 0ebe833e3ac4c1f17bb91ad4d0e0ffde6f1fb31f Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 6 Jul 2012 12:02:04 +0200
Subject: [PATCH] --- yaml --- r: 311983 b: refs/heads/master c:
 cc2caea5b6152b8ce66dc2bbe83dc72b60612da8 h: refs/heads/master i:   311981:
 d347f45e0de1708dbbe48fb655b9dd31e6e973f3   311979:
 a839b4571b2529d4c75d664c2cca9e2ef3557300   311975:
 9b72a1093d56756f0353f9cca99b4e54378f68a1   311967:
 9b8cc8d0b5851460dcc7a5605fefcf284102beb4 v: v3

---
 [refs]                                     | 2 +-
 trunk/include/asm-generic/dma-contiguous.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fbc6cfefd8e1..3e360b7e4f4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a6dccba2fdc2a69f1f36b8f1c0acc8598e7221b
+refs/heads/master: cc2caea5b6152b8ce66dc2bbe83dc72b60612da8
diff --git a/trunk/include/asm-generic/dma-contiguous.h b/trunk/include/asm-generic/dma-contiguous.h
index c544356b374b..294b1e755ab2 100644
--- a/trunk/include/asm-generic/dma-contiguous.h
+++ b/trunk/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;
 }