From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:7698 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760134AbaGYMUp (ORCPT ); Fri, 25 Jul 2014 08:20:45 -0400 From: Jisheng Zhang To: , , CC: , , , Jisheng Zhang Subject: [PATCH] PCI: tegra: add missing cleanup in error path and teardown_irq Date: Fri, 25 Jul 2014 20:18:23 +0800 Message-ID: <1406290703-2175-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-pci-owner@vger.kernel.org List-ID: 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 --- drivers/pci/host/pci-tegra.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 083cf37..695e7b9 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); @@ -1223,6 +1225,7 @@ 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_dispose_mapping(irq); tegra_msi_free(msi, d->hwirq); } -- 2.0.1