Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38060371 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

spi: s3c24xx: Add missing spi_master_{resume,suspend} calls to PM callbacks 



This is required since commit 2025172e "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: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 08850fa9

drivers/spi/spi-s3c24xx.c

+6 −1
Original line number Diff line number Diff line
@@ -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 = {