projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
drm/radeon: add additional SI pci ids
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-generic
/
dma-contiguous.h
diff --git
a/include/asm-generic/dma-contiguous.h
b/include/asm-generic/dma-contiguous.h
index c544356b374b62285b325c2df1ab77008c2422d1..294b1e755ab26e7bb47d9f1800ae132fc6667950 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;
}