Merge branch 'remotes/lorenzo/pci/tegra'

[mirror_ubuntu-jammy-kernel.git] / drivers / pci / controller / dwc / pcie-tegra194.c

diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
index ae30a2fd3716a78dd0c742c57907cabe94383fbc..92b77f7d83546a98730681a7de1cbe89703ea4d9 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -1623,7 +1623,7 @@ static int tegra_pcie_config_rp(struct tegra_pcie_dw *pcie)
        ret = pinctrl_pm_select_default_state(dev);
        if (ret < 0) {
                dev_err(dev, "Failed to configure sideband pins: %d\n", ret);
-               goto fail_pinctrl;
+               goto fail_pm_get_sync;
        }
 
        tegra_pcie_init_controller(pcie);
@@ -1650,9 +1650,8 @@ static int tegra_pcie_config_rp(struct tegra_pcie_dw *pcie)
 
 fail_host_init:
        tegra_pcie_deinit_controller(pcie);
-fail_pinctrl:
-       pm_runtime_put_sync(dev);
 fail_pm_get_sync:
+       pm_runtime_put_sync(dev);
        pm_runtime_disable(dev);
        return ret;
 }
@@ -2190,9 +2189,9 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev)
        }
 
        pp->irq = platform_get_irq_byname(pdev, "intr");
-       if (!pp->irq) {
+       if (pp->irq < 0) {
                dev_err(dev, "Failed to get \"intr\" interrupt\n");
-               return -ENODEV;
+               return pp->irq;
        }
 
        pcie->bpmp = tegra_bpmp_get(dev);