github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 22:14:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

spi: nxp-fspi: disable runtime PM on probe failures

Browse Source 
nxp_fspi_probe() enables runtime PM and autosuspend before
several operations that can fail.

Some failure paths returned directly before the devm cleanup
action was installed, leaving runtime PM enabled.

Route those failures through a common runtime PM cleanup path.
Use pm_runtime_resume_and_get() for the initial clock enable.

Signed-off-by: Jiawen Liu <1298662399@qq.com>
Link: https://patch.msgid.link/tencent_8FC0B8DFAF4AE67AEBA20548045D53A77707@qq.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jiawen Liu 2026-06-20 12:39:31 +04:00 committed by Mark Brown
parent 2543355f3d
commit 5d14285d60
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/spi/spi-nxp-fspi.c
View File

@ -1350,9 +1350,11 @@ static int nxp_fspi_probe(struct platform_device *pdev)
pm_runtime_use_autosuspend(dev);
/* enable clock */
ret = pm_runtime_get_sync(f->dev);
if (ret < 0)
return dev_err_probe(dev, ret, "Failed to enable clock");
ret = pm_runtime_resume_and_get(f->dev);
if (ret < 0) {
ret = dev_err_probe(dev, ret, "Failed to enable clock");
goto err_disable_pm;
}
/* Clear potential interrupts */
reg = fspi_readl(f, f->iobase + FSPI_INTR);
@ -1362,18 +1364,24 @@ static int nxp_fspi_probe(struct platform_device *pdev)
nxp_fspi_default_setup(f);
ret = pm_runtime_put_sync(dev);
if (ret < 0)
return dev_err_probe(dev, ret, "Failed to disable clock");
if (ret < 0) {
ret = dev_err_probe(dev, ret, "Failed to disable clock");
goto err_disable_pm;
}
init_completion(&f->c);
ret = devm_request_irq(dev, irq,
nxp_fspi_irq_handler, 0, pdev->name, f);
if (ret)
return dev_err_probe(dev, ret, "Failed to request irq\n");
if (ret) {
ret = dev_err_probe(dev, ret, "Failed to request irq\n");
goto err_disable_pm;
}
ret = devm_mutex_init(dev, &f->lock);
if (ret)
return dev_err_probe(dev, ret, "Failed to initialize lock\n");
if (ret) {
ret = dev_err_probe(dev, ret, "Failed to initialize lock\n");
goto err_disable_pm;
}
ctlr->bus_num = -1;
ctlr->num_chipselect = NXP_FSPI_MAX_CHIPSELECT;
@ -1389,6 +1397,11 @@ static int nxp_fspi_probe(struct platform_device *pdev)
return ret;
return devm_spi_register_controller(&pdev->dev, ctlr);
err_disable_pm:
pm_runtime_dont_use_autosuspend(dev);
pm_runtime_disable(dev);
return ret;
}
static int nxp_fspi_runtime_suspend(struct device *dev)