diff options
| author | Siddharth Vadapalli <[email protected]> | 2024-08-27 17:54:22 +0530 |
|---|---|---|
| committer | Krzysztof Wilczyński <[email protected]> | 2024-09-13 21:36:11 +0000 |
| commit | 4d60f6d4b8fa4d7bad4aeb2b3ee5c10425bc60a4 (patch) | |
| tree | 80830ea298a4726319fa11e7ac1dd79e82884269 | |
| parent | 03f84b3baba7836bdfc162c19288d5ce1aa92890 (diff) | |
PCI: dra7xx: Fix error handling when IRQ request fails in probe
Commit d4c7d1a089d6 ("PCI: dwc: dra7xx: Push request_irq()
call to the bottom of probe") moved the IRQ request for
"dra7xx-pcie-main" towards the end of dra7xx_pcie_probe().
However, the error handling does not take into account the
initialization performed by either dra7xx_add_pcie_port() or
dra7xx_add_pcie_ep(), depending on the mode of operation.
Fix the error handling to address this.
Fixes: d4c7d1a089d6 ("PCI: dwc: dra7xx: Push request_irq() call to the bottom of probe")
Link: https://lore.kernel.org/linux-pci/[email protected]
Tested-by: Udit Kumar <[email protected]>
Signed-off-by: Siddharth Vadapalli <[email protected]>
[kwilczynski: commit log]
Signed-off-by: Krzysztof Wilczyński <[email protected]>
Reviewed-by: Kevin Hilman <[email protected]>
Reviewed-by: Manivannan Sadhasivam <[email protected]>
Cc: [email protected]
| -rw-r--r-- | drivers/pci/controller/dwc/pci-dra7xx.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c index 20fb50741f3d..5c62e1a3ba52 100644 --- a/drivers/pci/controller/dwc/pci-dra7xx.c +++ b/drivers/pci/controller/dwc/pci-dra7xx.c @@ -854,11 +854,17 @@ static int dra7xx_pcie_probe(struct platform_device *pdev) "dra7xx-pcie-main", dra7xx); if (ret) { dev_err(dev, "failed to request irq\n"); - goto err_gpio; + goto err_deinit; } return 0; +err_deinit: + if (dra7xx->mode == DW_PCIE_RC_TYPE) + dw_pcie_host_deinit(&dra7xx->pci->pp); + else + dw_pcie_ep_deinit(&dra7xx->pci->ep); + err_gpio: err_get_sync: pm_runtime_put(dev); |