From e241cfd3bd3503ef6a909f41f0adf06be193fe25 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 26 Nov 2016 00:15:37 +0300 Subject: sparc64: restore irq in error paths in iommu There are some error paths where we should restore IRQs but we don't. Fixes: bb620c3d3925 ("sparc: Make sparc64 use scalable lib/iommu-common.c functions") Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller --- arch/sparc/kernel/pci_sun4v.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/sparc/kernel/pci_sun4v.c') diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c index cabb609fedcc..f4daccd12bf5 100644 --- a/arch/sparc/kernel/pci_sun4v.c +++ b/arch/sparc/kernel/pci_sun4v.c @@ -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 @@ bad: 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; } -- cgit v1.2.3-59-g8ed1b