spi: qup: Fix order of spi_register_master (045c243a) · Commits · 戴 / test

This patch moves the devm_spi_register_master below the initialization of the runtime_pm. If done in the wrong order, the spi_register_master fails if any probed slave devices issue SPI transactions. Signed-off-by:

Andy Gross <agross@codeaurora.org> Acked-by:

Ivan T. Ivanov <iivanov@mm-sol.com> Signed-off-by:

Mark Brown <broonie@linaro.org>

drivers/spi/spi-qup.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -640,16 +640,19 @@ static int spi_qup_probe(struct platform_device *pdev)
		if (ret)
		goto error;

		ret = devm_spi_register_master(dev, master);
		if (ret)
		goto error;

		pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC);
		pm_runtime_use_autosuspend(dev);
		pm_runtime_set_active(dev);
		pm_runtime_enable(dev);

		ret = devm_spi_register_master(dev, master);
		if (ret)
		goto disable_pm;

		return 0;

		disable_pm:
		pm_runtime_disable(&pdev->dev);
		error:
		clk_disable_unprepare(cclk);
		clk_disable_unprepare(iclk);

Admin message