[Patch v2 2/3] spi: qup: Fix order of spi_register_master

Andy Gross agross at codeaurora.org
Thu Jun 12 12:34:11 PDT 2014

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 at codeaurora.org>
Acked-by: Ivan T. Ivanov <iivanov at mm-sol.com>
 drivers/spi/spi-qup.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 3938c62..c08da38 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -619,16 +619,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);
+	ret = devm_spi_register_master(dev, master);
+	if (ret)
+		goto disable_pm;
 	return 0;
+	pm_runtime_disable(&pdev->dev);
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

More information about the linux-arm-kernel mailing list