diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-01-19 09:02:19 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-01-19 09:02:19 -0600 |
| commit | eb23674b07c43792405b95ffd73939638024f4f5 (patch) | |
| tree | 71e5d393e0097f788688d124c081eaf064b5ee21 /drivers/pci | |
| parent | cc7558d6e4fa2e06032f8c2dbd464e5757061ca8 (diff) | |
| parent | caf3f562e1161a86bd48a4c4c33af89d3693c658 (diff) | |
Merge branch 'pci/host-imx6' into next
* pci/host-imx6:
PCI: imx6: Remove redundant "Link never came up" message
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pci-imx6.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index c8cefb078218..66c3b84a84d7 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -502,10 +502,8 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) IMX6Q_GPR12_PCIE_CTL_2, 1 << 10); ret = imx6_pcie_wait_for_link(imx6_pcie); - if (ret) { - dev_info(dev, "Link never came up\n"); + if (ret) goto err_reset_phy; - } if (imx6_pcie->link_gen == 2) { /* Allow Gen2 mode after the link is up. */ |