---

yaml --- r: 311983 b: refs/heads/master c: cc2caea h: refs/heads/master i: 311981: d347f45 311979: a839b45 311975: 9b72a10 311967: 9b8cc8d v: v3
git-mirror · Jul 6, 2012 · 0ebe833 · 0ebe833
1 parent 6ade40f
commit 0ebe833
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }