2014-08-30 09:32:58 +00:00
|
|
|
From a7357be131e30fd1fb987b2cb343bc81db487f96 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Andy Gross <agross@codeaurora.org>
|
|
|
|
|
Date: Thu, 12 Jun 2014 14:34:11 -0500
|
|
|
|
|
Subject: [PATCH 134/182] spi: qup: Fix order of spi_register_master
|
|
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
---
|
|
|
|
|
drivers/spi/spi-qup.c | 11 +++++++----
|
|
|
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/spi/spi-qup.c
|
|
|
|
|
+++ b/drivers/spi/spi-qup.c
|
2014-09-10 21:40:19 +00:00
|
|
|
@@ -619,16 +619,19 @@ static int spi_qup_probe(struct platform
|
2014-08-30 09:32:58 +00:00
|
|
|
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);
|
