1 files changed, 12 insertions, 8 deletions

diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index a136932b8e6d..c8b4e46407ba 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -153,11 +153,12 @@ int dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt,
 {
         const struct dma_map_ops *ops = get_dma_ops(dev);
 
-        if (!dma_is_direct(ops) && ops->get_sgtable)
-                return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
-                                        attrs);
-        return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
-                        attrs);
+        if (dma_is_direct(ops))
+                return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr,
+                                size, attrs);
+        if (!ops->get_sgtable)
+                return -ENXIO;
+        return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size, attrs);
 }
 EXPORT_SYMBOL(dma_get_sgtable_attrs);
 
@@ -240,9 +241,12 @@ int dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma,
 {
         const struct dma_map_ops *ops = get_dma_ops(dev);
 
-        if (!dma_is_direct(ops) && ops->mmap)
-                return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
-        return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
+        if (dma_is_direct(ops))
+                return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size,
+                                attrs);
+        if (!ops->mmap)
+                return -ENXIO;
+        return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
 }
 EXPORT_SYMBOL(dma_mmap_attrs);