Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f3bc09 authored by Lukas Wunner's avatar Lukas Wunner Committed by Greg Kroah-Hartman
Browse files

spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path 



commit 5ef76dac0f2c26aeae4ee79eb830280f16d5aceb upstream.

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: cd050abeba2a ("spi: st-ssc4: add missed pm_runtime_disable")
Signed-off-by: default avatarLukas 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: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a33642f9

drivers/spi/spi-st-ssc4.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -379,13 +379,14 @@ static int spi_st_probe(struct platform_device *pdev) 
	ret = devm_spi_register_master(&pdev->dev, master);

	ret = devm_spi_register_master(&pdev->dev, master);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "Failed to register master\n");

		dev_err(&pdev->dev, "Failed to register master\n");

		goto clk_disable;

		goto rpm_disable;

	}

	}





	return 0;

	return 0;





clk_disable:

rpm_disable:

	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

clk_disable:

	clk_disable_unprepare(spi_st->clk);

	clk_disable_unprepare(spi_st->clk);

put_master:

put_master:

	spi_master_put(master);

	spi_master_put(master);