From: Bjorn Helgaas <bhelgaas@google.com>
To: Wei Yongjun <weiyj.lk@gmail.com>
Cc: kgene.kim@samsung.com, grant.likely@linaro.org,
rob.herring@calxeda.com, jg1.han@samsung.com,
tgih.jun@samsung.com, yongjun_wei@trendmicro.com.cn,
linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Subject: Re: [PATCH] PCI: exynos: missing clk_disable_unprepare() on error in exynos_pcie_probe()
Date: Fri, 4 Oct 2013 16:50:39 -0600 [thread overview]
Message-ID: <20131004225039.GA26108@google.com> (raw)
In-Reply-To: <CAPgLHd_RTNxi-OYhmTZ35NttjnAg-gQ_WKHkUQr5ueMhXVLTMg@mail.gmail.com>
On Sun, Sep 29, 2013 at 10:29:11AM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Add the missing clk_disable_unprepare() before return
> from exynos_pcie_probe() in the error handling case.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Applied with Jingoo's ack and Sylwester's subject line to
pci/host-exynos. Thanks!
Bjorn
> ---
> drivers/pci/host/pci-exynos.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
> index 94e096b..e25598a 100644
> --- a/drivers/pci/host/pci-exynos.c
> +++ b/drivers/pci/host/pci-exynos.c
> @@ -487,18 +487,24 @@ static int __init exynos_pcie_probe(struct platform_device *pdev)
>
> elbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> exynos_pcie->elbi_base = devm_ioremap_resource(&pdev->dev, elbi_base);
> - if (IS_ERR(exynos_pcie->elbi_base))
> - return PTR_ERR(exynos_pcie->elbi_base);
> + if (IS_ERR(exynos_pcie->elbi_base)) {
> + ret = PTR_ERR(exynos_pcie->elbi_base);
> + goto fail_bus_clk;
> + }
>
> phy_base = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> exynos_pcie->phy_base = devm_ioremap_resource(&pdev->dev, phy_base);
> - if (IS_ERR(exynos_pcie->phy_base))
> - return PTR_ERR(exynos_pcie->phy_base);
> + if (IS_ERR(exynos_pcie->phy_base)) {
> + ret = PTR_ERR(exynos_pcie->phy_base);
> + goto fail_bus_clk;
> + }
>
> block_base = platform_get_resource(pdev, IORESOURCE_MEM, 2);
> exynos_pcie->block_base = devm_ioremap_resource(&pdev->dev, block_base);
> - if (IS_ERR(exynos_pcie->block_base))
> - return PTR_ERR(exynos_pcie->block_base);
> + if (IS_ERR(exynos_pcie->block_base)) {
> + ret = PTR_ERR(exynos_pcie->block_base);
> + goto fail_bus_clk;
> + }
>
> ret = add_pcie_port(pp, pdev);
> if (ret < 0)
>
prev parent reply other threads:[~2013-10-04 22:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-29 2:29 [PATCH] PCI: exynos: missing clk_disable_unprepare() on error in exynos_pcie_probe() Wei Yongjun
2013-10-01 1:33 ` Jingoo Han
2013-10-01 13:49 ` Sylwester Nawrocki
2013-10-01 23:44 ` Jingoo Han
2013-10-04 22:50 ` Bjorn Helgaas [this message]
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=20131004225039.GA26108@google.com \
--to=bhelgaas@google.com \
--cc=grant.likely@linaro.org \
--cc=jg1.han@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=rob.herring@calxeda.com \
--cc=sylvester.nawrocki@gmail.com \
--cc=tgih.jun@samsung.com \
--cc=weiyj.lk@gmail.com \
--cc=yongjun_wei@trendmicro.com.cn \
/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).