summaryrefslogtreecommitdiffstats
path: root/kernel/dma
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2018-12-20 17:35:47 +0100
committerChristoph Hellwig <hch@lst.de>2018-12-20 17:47:55 +0100
commit8b1cce9f5832a8eda17d37a3c49fb7dd2d650f46 (patch)
treed73a821b8def58fd58a913bbbb297cceca343bd1 /kernel/dma
parentdma-mapping: deprecate dma_zalloc_coherent (diff)
downloadlinux-8b1cce9f5832a8eda17d37a3c49fb7dd2d650f46.tar.xz
linux-8b1cce9f5832a8eda17d37a3c49fb7dd2d650f46.zip
dma-mapping: fix inverted logic in dma_supported
The cleanup in commit 356da6d0cde3 ("dma-mapping: bypass indirect calls for dma-direct") accidentally inverted the logic in the check for the presence of a ->dma_supported() callback. Switch this back to the way it was to prevent a crash on boot. Fixes: 356da6d0cde3 ("dma-mapping: bypass indirect calls for dma-direct") Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'kernel/dma')
-rw-r--r--kernel/dma/mapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index fc84c81029d9..d7c34d2d1ba5 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -406,7 +406,7 @@ int dma_supported(struct device *dev, u64 mask)
if (dma_is_direct(ops))
return dma_direct_supported(dev, mask);
- if (ops->dma_supported)
+ if (!ops->dma_supported)
return 1;
return ops->dma_supported(dev, mask);
}