diff mbox

[RFT,1/2] spi: s3c24xx: Add missing spi_master_{resume,suspend} calls to PM callbacks

Message ID 1394003843.18343.2.camel@phoenix (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Axel Lin March 5, 2014, 7:17 a.m. UTC 
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>
---
 drivers/spi/spi-s3c24xx.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Mark Brown March 7, 2014, 5:59 a.m. UTC | #1 
On Wed, Mar 05, 2014 at 03:17:23PM +0800, Axel Lin wrote:
> 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.

Applied, thanks.
diff mbox

Patch

diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index a275445..bed2338 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -633,6 +633,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);
@@ -646,7 +651,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 = {