aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/dwc
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2017-07-15 23:41:53 -0700
committerBjorn Helgaas <bhelgaas@google.com>2017-08-03 16:55:43 -0500
commit89539f03061fc8aee120ea4a64d31da57d0045f2 (patch)
tree5cf3b085df68fd285302e1bcf02a6f9349ee68b8 /drivers/pci/dwc
parentPCI: dwc: designware: Handle ->host_init() failures (diff)
downloadlinux-dev-89539f03061fc8aee120ea4a64d31da57d0045f2.tar.xz
linux-dev-89539f03061fc8aee120ea4a64d31da57d0045f2.zip
PCI: qcom: Don't unroll init if ->init() fails
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> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>
Diffstat (limited to 'drivers/pci/dwc')
-rw-r--r--drivers/pci/dwc/pcie-qcom.c2
1 files changed, 1 insertions, 1 deletions
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)