Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e241cfd3 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

sparc64: restore irq in error paths in iommu 



There are some error paths where we should restore IRQs but we don't.

Fixes: bb620c3d ("sparc: Make sparc64 use scalable lib/iommu-common.c functions")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 601e6e3c

arch/sparc/kernel/pci_sun4v.c

+2 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size, 
	return ret;



iommu_map_fail:

	local_irq_restore(flags);

	iommu_tbl_range_free(tbl, *dma_addrp, npages, IOMMU_ERROR_CODE);



range_alloc_fail:
@@ -414,6 +415,7 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page, 
	return DMA_ERROR_CODE;



iommu_map_fail:

	local_irq_restore(flags);

	iommu_tbl_range_free(tbl, bus_addr, npages, IOMMU_ERROR_CODE);

	return DMA_ERROR_CODE;

}