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

Commit cfb29d1f authored by Lubomir Rintel's avatar Lubomir Rintel Committed by Greg Kroah-Hartman
Browse files

spi: pxa2xx: Balance runtime PM enable/disable on error 



[ Upstream commit 1274204542f683e1d8491ebe9cc86284d5a8ebcc ]

Don't undo the PM initialization if we error out before we managed to
initialize it. The call to pm_runtime_disable() without being preceded
by pm_runtime_enable() would disturb the balance of the Force.

In practice, this happens if we fail to allocate any of the GPIOS ("cs",
"ready") due to -EPROBE_DEFER because we're getting probled before the
GPIO driver.

Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
Link: https://lore.kernel.org/r/20190719122713.3444318-1-lkundrak@v3.sk


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a2bae635

drivers/spi/spi-pxa2xx.c

+4 −2
Original line number Diff line number Diff line
@@ -1742,14 +1742,16 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) 
	status = spi_register_controller(master);

	if (status != 0) {

		dev_err(&pdev->dev, "problem registering spi master\n");

		goto out_error_clock_enabled;

		goto out_error_pm_runtime_enabled;

	}



	return status;



out_error_clock_enabled:

out_error_pm_runtime_enabled:

	pm_runtime_put_noidle(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



out_error_clock_enabled:

	clk_disable_unprepare(ssp->clk);



out_error_dma_irq_alloc: