On Tue, Jul 29, 2014 at 09:33:30AM +0800, Jisheng Zhang wrote:
> 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.
>
> Signed-off-by: Jisheng Zhang <jszhang@xxxxxxxxxxx>
Applied to pci/host-tegra for v3.18, with the irqd_to_hwirq() change
Thierry suggested and his Reviewed-by and Ack, thanks!
> ---
> drivers/pci/host/pci-tegra.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
> index 083cf37..4ccc418 100644
> --- a/drivers/pci/host/pci-tegra.c
> +++ b/drivers/pci/host/pci-tegra.c
> @@ -1203,8 +1203,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);
>
> @@ -1222,8 +1224,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);
> + unsigned long hwirq = d->hwirq;
>
> - tegra_msi_free(msi, d->hwirq);
> + irq_dispose_mapping(irq);
> + tegra_msi_free(msi, hwirq);
> }
>
> static struct irq_chip tegra_msi_irq_chip = {
> --
> 2.0.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
