[PATCH] pci, msi: Unmask MSI if setup failed

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The initial state of mask register of MSI is unmasked.
We setup it masked before calling arch_setup_msi_irqs().
In case if arch_setup_msi_irq() failed, it is better to restore
the state of the mask register.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx>
---
 drivers/pci/msi.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index e784526..339d94a 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -409,6 +409,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec)
 	/* Configure MSI capability structure */
 	ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSI);
 	if (ret) {
+		msi_mask_irq(entry, mask, ~mask);
 		msi_free_irqs(dev);
 		return ret;
 	}
-- 
1.6.3.3


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [DMA Engine]     [Linux Coverity]     [Linux USB]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Greybus]

  Powered by Linux