Skip to content

Commit 8670544

Browse files
wensbjorn-helgaas
authored andcommitted
PCI: mediatek-gen3: Add error path for resume driver callbacks
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. Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> Signed-off-by: Manivannan Sadhasivam <mani@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Link: https://patch.msgid.link/20260324052002.4072430-5-wenst@chromium.org
1 parent cf417e6 commit 8670544

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

drivers/pci/controller/pcie-mediatek-gen3.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,14 +1304,16 @@ static int mtk_pcie_resume_noirq(struct device *dev)
13041304
return err;
13051305

13061306
err = mtk_pcie_startup_port(pcie);
1307-
if (err) {
1308-
mtk_pcie_power_down(pcie);
1309-
return err;
1310-
}
1307+
if (err)
1308+
goto err_power_down;
13111309

13121310
mtk_pcie_irq_restore(pcie);
13131311

13141312
return 0;
1313+
1314+
err_power_down:
1315+
mtk_pcie_power_down(pcie);
1316+
return err;
13151317
}
13161318

13171319
static const struct dev_pm_ops mtk_pcie_pm_ops = {

0 commit comments

Comments
 (0)