Merge tag 'dma-mapping-5.15' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-microblaze.git] / arch / s390 / pci / pci_dma.c

diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index 58f2f7a..93223bd 100644 (file)
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -487,18 +487,18 @@ static int s390_dma_map_sg(struct device *dev, struct scatterlist *sg,
        unsigned int max = dma_get_max_seg_size(dev);
        unsigned int size = s->offset + s->length;
        unsigned int offset = s->offset;
-       int count = 0, i;
+       int count = 0, i, ret;
 
        for (i = 1; i < nr_elements; i++) {
                s = sg_next(s);
 
-               s->dma_address = DMA_MAPPING_ERROR;
                s->dma_length = 0;
 
                if (s->offset || (size & ~PAGE_MASK) ||
                    size + s->length > max) {
-                       if (__s390_dma_map_sg(dev, start, size,
-                                             &dma->dma_address, dir))
+                       ret = __s390_dma_map_sg(dev, start, size,
+                                               &dma->dma_address, dir);
+                       if (ret)
                                goto unmap;
 
                        dma->dma_address += offset;
@@ -511,7 +511,8 @@ static int s390_dma_map_sg(struct device *dev, struct scatterlist *sg,
                }
                size += s->length;
        }
-       if (__s390_dma_map_sg(dev, start, size, &dma->dma_address, dir))
+       ret = __s390_dma_map_sg(dev, start, size, &dma->dma_address, dir);
+       if (ret)
                goto unmap;
 
        dma->dma_address += offset;
@@ -523,7 +524,7 @@ unmap:
                s390_dma_unmap_pages(dev, sg_dma_address(s), sg_dma_len(s),
                                     dir, attrs);
 
-       return 0;
+       return ret;
 }
 
 static void s390_dma_unmap_sg(struct device *dev, struct scatterlist *sg,