git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mm: cma: fix condition check when setting global cma area
[pandora-kernel.git]
/
include
/
asm-generic
/
dma-contiguous.h
diff --git
a/include/asm-generic/dma-contiguous.h
b/include/asm-generic/dma-contiguous.h
index
c544356
..
294b1e7
100644
(file)
--- 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;
}