From: Shawn Guo <shawn.guo@linaro.org>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Rob Herring <robh+dt@kernel.org>,
Fabio Estevam <festevam@gmail.com>,
Jianguo Sun <sunjianguo1@huawei.com>,
linux-pci@vger.kernel.org, devicetree@vger.kernel.org,
project-aspen-dev@linaro.org, Shawn Guo <shawn.guo@linaro.org>
Subject: [PATCH v2 1/2] PCI: histb: fix error path of histb_pcie_host_enable()
Date: Tue, 23 Jan 2018 23:45:36 +0800 [thread overview]
Message-ID: <1516722337-1533-2-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1516722337-1533-1-git-send-email-shawn.guo@linaro.org>
If clk_prepare_enable() call fails on a particular clock, we should not
call clk_disable_unprepare() on this clock, but on the clocks that
succeed from clk_prepare_enable() previously.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
drivers/pci/dwc/pcie-histb.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/dwc/pcie-histb.c b/drivers/pci/dwc/pcie-histb.c
index 33b01b734d7d..6395394be5b4 100644
--- a/drivers/pci/dwc/pcie-histb.c
+++ b/drivers/pci/dwc/pcie-histb.c
@@ -279,13 +279,12 @@ static int histb_pcie_host_enable(struct pcie_port *pp)
return 0;
err_aux_clk:
- clk_disable_unprepare(hipcie->aux_clk);
-err_pipe_clk:
clk_disable_unprepare(hipcie->pipe_clk);
-err_sys_clk:
+err_pipe_clk:
clk_disable_unprepare(hipcie->sys_clk);
-err_bus_clk:
+err_sys_clk:
clk_disable_unprepare(hipcie->bus_clk);
+err_bus_clk:
return ret;
}
--
1.9.1
next prev parent reply other threads:[~2018-01-23 15:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-23 15:45 [PATCH v2 0/2] Add power control for pcie-histb driver Shawn Guo
2018-01-23 15:45 ` Shawn Guo [this message]
2018-01-23 15:45 ` [PATCH v2 2/2] PCI: histb: add an optional regulator for PCIe port power control Shawn Guo
2018-01-30 0:07 ` Rob Herring
2018-03-01 15:09 ` Bjorn Helgaas
2018-03-01 1:22 ` [PATCH v2 0/2] Add power control for pcie-histb driver Shawn Guo
2018-03-01 15:08 ` Bjorn Helgaas
2018-03-01 18:11 ` Lorenzo Pieralisi
2018-03-02 0:43 ` Shawn Guo
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=1516722337-1533-2-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=linux-pci@vger.kernel.org \
--cc=project-aspen-dev@linaro.org \
--cc=robh+dt@kernel.org \
--cc=sunjianguo1@huawei.com \
/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).