diff options
| author | Bjorn Helgaas | 2020-10-21 09:58:41 -0500 |
|---|---|---|
| committer | Bjorn Helgaas | 2020-10-21 09:58:41 -0500 |
| commit | 29828fc20ab1c5d2f41e2749921c4bd32da6c38e (patch) | |
| tree | d1c990523f8869c3ad4ae0393f4b9ce146b52d05 /drivers/pci/controller | |
| parent | 7ba381c449fdfaae9768e092e1e8a87ac1459561 (diff) | |
| parent | ecc3e424d190eb2408751d2100e97a48f69a222d (diff) | |
Merge branch 'remotes/lorenzo/pci/kirin'
- Return -EPROBE_DEFER in case the gpio isn't ready (Bean Huo)
* remotes/lorenzo/pci/kirin:
PCI: kirin: Return -EPROBE_DEFER in case the gpio isn't ready
Diffstat (limited to 'drivers/pci/controller')
| -rw-r--r-- | drivers/pci/controller/dwc/pcie-kirin.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c index 6f01ae013326..d0a6a2dee6f5 100644 --- a/drivers/pci/controller/dwc/pcie-kirin.c +++ b/drivers/pci/controller/dwc/pcie-kirin.c @@ -508,8 +508,12 @@ static int kirin_pcie_probe(struct platform_device *pdev) kirin_pcie->gpio_id_reset = of_get_named_gpio(dev->of_node, "reset-gpios", 0); - if (kirin_pcie->gpio_id_reset < 0) + if (kirin_pcie->gpio_id_reset == -EPROBE_DEFER) { + return -EPROBE_DEFER; + } else if (!gpio_is_valid(kirin_pcie->gpio_id_reset)) { + dev_err(dev, "unable to get a valid gpio pin\n"); return -ENODEV; + } ret = kirin_pcie_power_on(kirin_pcie); if (ret) |