Skip to content

Commit

Permalink
dma-direct: return appropriate error code from dma_direct_map_sg()
Browse files Browse the repository at this point in the history
Now that the map_sg() op expects error codes instead of return zero on
error, convert dma_direct_map_sg() to return an error code. Per the
documentation for dma_map_sgtable(), -EIO is returned due to an
DMA_MAPPING_ERROR with unknown cause.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
lsgunth authored and Christoph Hellwig committed Aug 9, 2021
1 parent fffe3cc commit c81be74
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/dma/direct.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents,

out_unmap:
dma_direct_unmap_sg(dev, sgl, i, dir, attrs | DMA_ATTR_SKIP_CPU_SYNC);
return 0;
return -EIO;
}

dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
Expand Down

0 comments on commit c81be74

Please sign in to comment.