Merge tag 'cxl-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl

[linux-2.6-microblaze.git] / arch / alpha / kernel / pci_iommu.c

diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index 35d7b30..21f9ac1 100644 (file)
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -649,7 +649,9 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg,
                sg->dma_address
                  = pci_map_single_1(pdev, SG_ENT_VIRT_ADDRESS(sg),
                                     sg->length, dac_allowed);
-               return sg->dma_address != DMA_MAPPING_ERROR;
+               if (sg->dma_address == DMA_MAPPING_ERROR)
+                       return -EIO;
+               return 1;
        }
 
        start = sg;
@@ -685,8 +687,10 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg,
        if (out < end)
                out->dma_length = 0;
 
-       if (out - start == 0)
+       if (out - start == 0) {
                printk(KERN_WARNING "pci_map_sg failed: no entries?\n");
+               return -ENOMEM;
+       }
        DBGA("pci_map_sg: %ld entries\n", out - start);
 
        return out - start;
@@ -699,7 +703,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg,
           entries.  Unmap them now.  */
        if (out > start)
                pci_unmap_sg(pdev, start, out - start, dir);
-       return 0;
+       return -ENOMEM;
 }
 
 /* Unmap a set of streaming mode DMA translations.  Again, cpu read