[PATCH v4 4/7] PCI: mediatek-gen3: Add error path for resume driver callbacks
Chen-Yu Tsai
wenst at chromium.org
Tue Mar 10 02:19:43 PDT 2026
The resume callback currently does teardown in the conditional block
directly. This is going to get ugly when the pwrctrl calls are added.
Move the teardown to a proper error cleanup path.
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski at oss.qualcomm.com>
Reviewed-by: Manivannan Sadhasivam <mani at kernel.org>
Signed-off-by: Chen-Yu Tsai <wenst at chromium.org>
---
Changes since v3:
- Dropped probe function error path; covered in previous patch
---
drivers/pci/controller/pcie-mediatek-gen3.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
index 1b6290f2c360..22a16e4ebc76 100644
--- a/drivers/pci/controller/pcie-mediatek-gen3.c
+++ b/drivers/pci/controller/pcie-mediatek-gen3.c
@@ -1304,14 +1304,16 @@ static int mtk_pcie_resume_noirq(struct device *dev)
return err;
err = mtk_pcie_startup_port(pcie);
- if (err) {
- mtk_pcie_power_down(pcie);
- return err;
- }
+ if (err)
+ goto err_power_down;
mtk_pcie_irq_restore(pcie);
return 0;
+
+err_power_down:
+ mtk_pcie_power_down(pcie);
+ return err;
}
static const struct dev_pm_ops mtk_pcie_pm_ops = {
--
2.53.0.473.g4a7958ca14-goog
More information about the Linux-mediatek
mailing list