spi: coldfire-qspi: Enable clock before calling spi_master_resume

This ensures clock has been enabled before calling spi_master_resume().
while at it, also add checking return value of spi_master_suspend and
spi_master_resume because they may fail.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index 8d594c6704ad..94d817523d5f 100644
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -473,8 +473,11 @@ static int mcfqspi_suspend(struct device *dev)
 {
         struct spi_master *master = dev_get_drvdata(dev);
         struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
+        int ret;
 
-        spi_master_suspend(master);
+        ret = spi_master_suspend(master);
+        if (ret)
+                return ret;
 
         clk_disable(mcfqspi->clk);
 
@@ -486,11 +489,9 @@ static int mcfqspi_resume(struct device *dev)
         struct spi_master *master = dev_get_drvdata(dev);
         struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
 
-        spi_master_resume(master);
-
         clk_enable(mcfqspi->clk);
 
-        return 0;
+        return spi_master_resume(master);
 }
 #endif