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;
 }