From: Shawn Lin <shawn.lin@rock-chips.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org,
Brian Norris <briannorris@chromium.org>,
Jeffy Chen <jeffy.chen@rock-chips.com>,
Shawn Lin <shawn.lin@rock-chips.com>
Subject: [PATCH v5 09/10] PCI: rockchip: remove irq domain if failing to probe
Date: Wed, 23 Aug 2017 15:03:31 +0800 [thread overview]
Message-ID: <1503471811-74167-1-git-send-email-shawn.lin@rock-chips.com> (raw)
In-Reply-To: <1503471673-69478-1-git-send-email-shawn.lin@rock-chips.com>
From: Jeffy Chen <jeffy.chen@rock-chips.com>
Fix the missing to call irq_domain_remove if failing
to finish the probe.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/pci/host/pcie-rockchip.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c
index 6dbd3fd..e752d3e 100644
--- a/drivers/pci/host/pcie-rockchip.c
+++ b/drivers/pci/host/pcie-rockchip.c
@@ -1572,7 +1572,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
err = of_pci_get_host_bridge_resources(dev->of_node, 0, 0xff,
&res, &io_base);
if (err)
- goto err_deinit_port;
+ goto err_remove_irq_domain;
err = devm_request_pci_bus_resources(dev, &res);
if (err)
@@ -1644,6 +1644,8 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
err_free_res:
pci_free_resource_list(&res);
+err_remove_irq_domain:
+ irq_domain_remove(rockchip->irq_domain);
err_deinit_port:
rockchip_pcie_deinit_phys(rockchip);
err_vpcie:
--
1.9.1
next prev parent reply other threads:[~2017-08-23 7:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-23 7:01 [PATCH v5 0/10] Some cleanup and bug fix for pcie-rockchip Shawn Lin
2017-08-23 7:02 ` [PATCH v5 01/10] PCI: rockchip: spilt out rockchip_pcie_setup_irq Shawn Lin
2017-08-23 7:02 ` [PATCH v5 02/10] PCI: rockchip: spilt out rockchip_pcie_enable_clocks Shawn Lin
2017-08-23 7:02 ` [PATCH v5 03/10] PCI: rockchip: spilt out rockchip_pcie_disable_clocks Shawn Lin
2017-08-23 7:02 ` [PATCH v5 04/10] PCI: rockchip: fix system hang up if activating CONFIG_DEBUG_SHIRQ Shawn Lin
2017-08-24 20:21 ` Bjorn Helgaas
2017-08-24 21:10 ` Dmitry Torokhov
2017-08-25 1:44 ` Brian Norris
2017-08-25 1:05 ` jeffy
2017-08-25 1:38 ` Shawn Lin
2017-08-23 7:02 ` [PATCH v5 05/10] PCI: rockchip: spilt out rockchip_pcie_deinit_phys Shawn Lin
2017-08-23 7:02 ` [PATCH v5 06/10] PCI: rockchip: fix missing phy manipulation for legacy phy Shawn Lin
2017-08-25 21:18 ` Bjorn Helgaas
2017-08-23 7:03 ` [PATCH v5 07/10] PCI: rockchip: Clean up PHY if driver probe or resume fails Shawn Lin
2017-08-23 7:03 ` [PATCH v5 08/10] PCI: rockchip: disable vpcie0v9 for resume_noirq error handling path Shawn Lin
2017-08-23 7:03 ` Shawn Lin [this message]
2017-08-23 7:03 ` [PATCH v5 10/10] PCI: rockchip: umap io space if failing to probe Shawn Lin
2017-08-25 21:38 ` [PATCH v5 0/10] Some cleanup and bug fix for pcie-rockchip Bjorn Helgaas
2017-08-28 2:22 ` Shawn Lin
2017-08-28 18:33 ` Bjorn Helgaas
2017-08-29 0:47 ` Shawn Lin
2017-08-29 18:25 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1503471811-74167-1-git-send-email-shawn.lin@rock-chips.com \
--to=shawn.lin@rock-chips.com \
--cc=bhelgaas@google.com \
--cc=briannorris@chromium.org \
--cc=jeffy.chen@rock-chips.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).