Commit ba938f3a authored by Wenyou Yang's avatar Wenyou Yang Committed by Mark Brown
Browse files

spi: atmel: add missing spi_master_{resume,suspend} calls to PM callbacks 



The PM callbacks implemented by the spi-atmel driver don't call
spi_master_{resume,suspend}, fix that.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

drivers/spi/spi-atmel.c

+16 −1
Original line number Diff line number Diff line
@@ -1455,6 +1455,14 @@ static int atmel_spi_suspend(struct device *dev) 
{

	struct spi_master	*master = dev_get_drvdata(dev);

	struct atmel_spi	*as = spi_master_get_devdata(master);

	int ret;



	/* Stop the queue running */

	ret = spi_master_suspend(master);

	if (ret) {

		dev_warn(dev, "cannot suspend master\n");

		return ret;

	}



	clk_disable_unprepare(as->clk);

	return 0;
@@ -1464,9 +1472,16 @@ static int atmel_spi_resume(struct device *dev) 
{

	struct spi_master	*master = dev_get_drvdata(dev);

	struct atmel_spi	*as = spi_master_get_devdata(master);

	int ret;



	clk_prepare_enable(as->clk);

	return 0;



	/* Start the queue running */

	ret = spi_master_resume(master);

	if (ret)

		dev_err(dev, "problem starting queue (%d)\n", ret);



	return ret;

}



static SIMPLE_DEV_PM_OPS(atmel_spi_pm_ops, atmel_spi_suspend, atmel_spi_resume);