linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Stanimir Varbanov <svarbanov@mm-sol.com>,
	Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org (open list:PCIE DRIVER FOR QUALCOMM
	MSM),
	linux-arm-msm@vger.kernel.org (open list:PCIE DRIVER FOR
	QUALCOMM MSM), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 2/3] PCI: qcom: Don't unroll init if init fails
Date: Sat, 15 Jul 2017 23:39:46 -0700	[thread overview]
Message-ID: <20170716063947.3272-2-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20170716063947.3272-1-bjorn.andersson@linaro.org>

When the init op fails it will restore the state of the resources, so we
should not disable them one more time when this happens.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/pci/dwc/pcie-qcom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c
index d15657dc3990..7b703741a3fd 100644
--- a/drivers/pci/dwc/pcie-qcom.c
+++ b/drivers/pci/dwc/pcie-qcom.c
@@ -901,7 +901,7 @@ static int qcom_pcie_host_init(struct pcie_port *pp)
 
 	ret = pcie->ops->init(pcie);
 	if (ret)
-		goto err_deinit;
+		return ret;
 
 	ret = phy_power_on(pcie->phy);
 	if (ret)
-- 
2.12.0

  reply	other threads:[~2017-07-16  6:39 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-16  6:39 [PATCH 1/3] PCI: dwc: Handle host_init failures Bjorn Andersson
2017-07-16  6:39 ` Bjorn Andersson [this message]
2017-08-03  9:24   ` [PATCH 2/3] PCI: qcom: Don't unroll init if init fails Stanimir Varbanov
2017-07-17 11:18 ` [PATCH 1/3] PCI: dwc: Handle host_init failures Joao Pinto
2017-07-17 19:28   ` Jingoo Han
2017-08-03 21:19 ` Bjorn Helgaas
  -- strict thread matches above, loose matches on Subject: below --
2017-07-16  6:41 [PATCH 2/3] PCI: qcom: Don't unroll init if init fails Bjorn Andersson
2017-08-02 21:39 ` 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=20170716063947.3272-2-bjorn.andersson@linaro.org \
    --to=bjorn.andersson@linaro.org \
    --cc=bhelgaas@google.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=svarbanov@mm-sol.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).