mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 06:12:08 +00:00
spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path
If the calls to devm_platform_ioremap_resource(), irq_of_parse_and_map()
or devm_request_irq() fail on probe of the ST SSC4 SPI driver, the
runtime PM disable depth is incremented even though it was not
decremented before. Fix it.
Fixes: cd050abeba
("spi: st-ssc4: add missed pm_runtime_disable")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v5.5+
Cc: Chuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/fbe8768c30dc829e2d77eabe7be062ca22f84024.1604874488.git.lukas@wunner.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
c575e9113b
commit
5ef76dac0f
@ -375,13 +375,14 @@ static int spi_st_probe(struct platform_device *pdev)
|
||||
ret = devm_spi_register_master(&pdev->dev, master);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Failed to register master\n");
|
||||
goto clk_disable;
|
||||
goto rpm_disable;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
clk_disable:
|
||||
rpm_disable:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
clk_disable:
|
||||
clk_disable_unprepare(spi_st->clk);
|
||||
put_master:
|
||||
spi_master_put(master);
|
||||
|
Loading…
Reference in New Issue
Block a user