diff options
| author | Jisheng Zhang <jszhang@marvell.com> | 2014-07-29 09:33:30 +0800 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-04 14:49:24 -0600 |
| commit | 019fa46ebc93c654da1b29f472a66b3bf7880464 (patch) | |
| tree | 2ac0ee08e3a6c9bec67891657da79c6e14af3ee6 | |
| parent | 8d38821cbcf51292cd5a23469d03bd38932a3ba9 (diff) | |
| download | linux-019fa46ebc93c654da1b29f472a66b3bf7880464.tar.gz | |
PCI: tegra: Add missing cleanup in error path and tegra_msi_teardown_irq()
We should call tegra_msi_free() to free the MSI bit if irq_create_mapping()
fails. And we need to dispose the IRQ mapping during IRQ teardown.
[bhelgaas: made irqd_to_hwirq() change suggested by Thierry]
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | drivers/pci/host/pci-tegra.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 0fb0fdb223d5..5fbf31e02c77 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -1170,8 +1170,10 @@ static int tegra_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, return hwirq; irq = irq_create_mapping(msi->domain, hwirq); - if (!irq) + if (!irq) { + tegra_msi_free(msi, hwirq); return -EINVAL; + } irq_set_msi_desc(irq, desc); @@ -1189,8 +1191,10 @@ static void tegra_msi_teardown_irq(struct msi_chip *chip, unsigned int irq) { struct tegra_msi *msi = to_tegra_msi(chip); struct irq_data *d = irq_get_irq_data(irq); + irq_hw_number_t hwirq = irqd_to_hwirq(d); - tegra_msi_free(msi, d->hwirq); + irq_dispose_mapping(irq); + tegra_msi_free(msi, hwirq); } static struct irq_chip tegra_msi_irq_chip = { |