diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-03-05 02:17:23 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-07 01:00:02 -0500 |
commit | 380603712072145785f19040b9791f4f6cde414e (patch) | |
tree | d29335387af88f328f9f6eaf8f43a1ed4aa254d4 /drivers/spi/spi-s3c24xx.c | |
parent | 08850fa94831d374f4d827a85088f6087836dfc8 (diff) |
spi: s3c24xx: Add missing spi_master_{resume,suspend} calls to PM callbacks
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>
Diffstat (limited to 'drivers/spi/spi-s3c24xx.c')
-rw-r--r-- | drivers/spi/spi-s3c24xx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c index f1ffbfa6acef..b7f5c349a3c0 100644 --- a/drivers/spi/spi-s3c24xx.c +++ b/drivers/spi/spi-s3c24xx.c | |||
@@ -634,6 +634,11 @@ static int s3c24xx_spi_remove(struct platform_device *dev) | |||
634 | static int s3c24xx_spi_suspend(struct device *dev) | 634 | static int s3c24xx_spi_suspend(struct device *dev) |
635 | { | 635 | { |
636 | struct s3c24xx_spi *hw = dev_get_drvdata(dev); | 636 | struct s3c24xx_spi *hw = dev_get_drvdata(dev); |
637 | int ret; | ||
638 | |||
639 | ret = spi_master_suspend(hw->master); | ||
640 | if (ret) | ||
641 | return ret; | ||
637 | 642 | ||
638 | if (hw->pdata && hw->pdata->gpio_setup) | 643 | if (hw->pdata && hw->pdata->gpio_setup) |
639 | hw->pdata->gpio_setup(hw->pdata, 0); | 644 | hw->pdata->gpio_setup(hw->pdata, 0); |
@@ -647,7 +652,7 @@ static int s3c24xx_spi_resume(struct device *dev) | |||
647 | struct s3c24xx_spi *hw = dev_get_drvdata(dev); | 652 | struct s3c24xx_spi *hw = dev_get_drvdata(dev); |
648 | 653 | ||
649 | s3c24xx_spi_initialsetup(hw); | 654 | s3c24xx_spi_initialsetup(hw); |
650 | return 0; | 655 | return spi_master_resume(hw->master); |
651 | } | 656 | } |
652 | 657 | ||
653 | static const struct dev_pm_ops s3c24xx_spi_pmops = { | 658 | static const struct dev_pm_ops s3c24xx_spi_pmops = { |