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

Commit 836d1a22 authored by Antonio Ospite's avatar Antonio Ospite Committed by Mark Brown
Browse files

spi/pxa2xx: fix runtime PM enabling order 



In commit 7dd62787 (spi/pxa2xx: Convert
to core runtime PM) master->auto_runtime_pm was set to true.

In this case pm_runtime_enable() must be called *before*
spi_register_master(), otherwise the kernel hangs with this error
message:

  spi_master spi0: Failed to power device: -13

A similar fix, but for spi/hspi, was applied in
268d7643.

Signed-off-by: default avatarAntonio Ospite <ao2@ao2.it>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent d6ba32d5

drivers/spi/spi-pxa2xx.c

+5 −5
Original line number Diff line number Diff line
@@ -1202,6 +1202,11 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) 
	tasklet_init(&drv_data->pump_transfers, pump_transfers,

		     (unsigned long)drv_data);



	pm_runtime_set_autosuspend_delay(&pdev->dev, 50);

	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);



	/* Register with the SPI framework */

	platform_set_drvdata(pdev, drv_data);

	status = devm_spi_register_master(&pdev->dev, master);
@@ -1210,11 +1215,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) 
		goto out_error_clock_enabled;

	}



	pm_runtime_set_autosuspend_delay(&pdev->dev, 50);

	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);



	return status;



out_error_clock_enabled: