mirror of
https://github.com/torvalds/linux.git
synced 2026-05-21 21:37:25 +02:00
PCI: dra7xx: Fix error handling when IRQ request fails in probe
Commitd4c7d1a089("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:d4c7d1a089("PCI: dwc: dra7xx: Push request_irq() call to the bottom of probe") Link: https://lore.kernel.org/linux-pci/20240827122422.985547-3-s-vadapalli@ti.com Tested-by: Udit Kumar <u-kumar1@ti.com> Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> Reviewed-by: Kevin Hilman <khilman@baylibre.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Cc: stable@vger.kernel.org
This commit is contained in:
parent
03f84b3bab
commit
4d60f6d4b8
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user