diff options
| author | Martin Oliveira <[email protected]> | 2021-07-29 14:15:26 -0600 |
|---|---|---|
| committer | Christoph Hellwig <[email protected]> | 2021-08-09 17:13:05 +0200 |
| commit | 62af5ca50c29a9be266656dfb88db6d439d129a1 (patch) | |
| tree | 5e1e2624facf4b59e4ce8ebb1cdedc7f9272c637 | |
| parent | 9cf88ec5e0e876c959389b1e695438f98663b92d (diff) | |
ia64/sba_iommu: return error code from sba_map_sg_attrs()
The .map_sg() op now expects an error code instead of zero on failure.
In the case of a dma_mapping_error() return -EIO as the actual cause
is opaque here.
sba_coalesce_chunks() may only presently fail if sba_alloc_range()
fails, which in turn only fails if the iommu is out of mapping
resources, hence a -ENOMEM is used in that case.
Signed-off-by: Martin Oliveira <[email protected]>
Signed-off-by: Logan Gunthorpe <[email protected]>
Cc: Michael Ellerman <[email protected]>
Cc: Niklas Schnelle <[email protected]>
Cc: Thomas Bogendoerfer <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
| -rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 9148ddbf02e5..8ad6946521d8 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -1459,7 +1459,7 @@ static int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, sglist->dma_address = sba_map_page(dev, sg_page(sglist), sglist->offset, sglist->length, dir, attrs); if (dma_mapping_error(dev, sglist->dma_address)) - return 0; + return -EIO; return 1; } @@ -1486,7 +1486,7 @@ static int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, coalesced = sba_coalesce_chunks(ioc, dev, sglist, nents); if (coalesced < 0) { sba_unmap_sg_attrs(dev, sglist, nents, dir, attrs); - return 0; + return -ENOMEM; } /* |