spi: s3c24xx: Add missing spi_master_{resume,suspend} calls to PM callbacks
authorAxel Lin <axel.lin@ingics.com>
Wed, 5 Mar 2014 07:17:23 +0000 (15:17 +0800)
committerMark Brown <broonie@linaro.org>
Fri, 7 Mar 2014 06:00:02 +0000 (14:00 +0800)
This is required since commit 2025172e3280 "spi/bitbang: Use core message pump".
spi-bitbang now uses core message pump, so it needs to call spi_master_suspend/
spi_master_resume to start/stop the queue while suspend/resume.

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

index f1ffbfa6acef3b6afb75d45ce3562758f88be3a5..b7f5c349a3c057d15a9cf3f9fc94398deaf3195e 100644 (file)
@@ -634,6 +634,11 @@ static int s3c24xx_spi_remove(struct platform_device *dev)
 static int s3c24xx_spi_suspend(struct device *dev)
 {
        struct s3c24xx_spi *hw = dev_get_drvdata(dev);
+       int ret;
+
+       ret = spi_master_suspend(hw->master);
+       if (ret)
+               return ret;
 
        if (hw->pdata && hw->pdata->gpio_setup)
                hw->pdata->gpio_setup(hw->pdata, 0);
@@ -647,7 +652,7 @@ static int s3c24xx_spi_resume(struct device *dev)
        struct s3c24xx_spi *hw = dev_get_drvdata(dev);
 
        s3c24xx_spi_initialsetup(hw);
-       return 0;
+       return spi_master_resume(hw->master);
 }
 
 static const struct dev_pm_ops s3c24xx_spi_pmops = {