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

diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c
index 6f01ae013326b45537f3d0ea3279f669df0cee56..d0a6a2dee6f5be7f905bee47900a8cb80d7d0451 100644 (file)
--- 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)