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

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

spi: coldfire-qspi: Enable clock before calling spi_master_resume 



This ensures clock has been enabled before calling spi_master_resume().
while at it, also add checking return value of spi_master_suspend and
spi_master_resume because they may fail.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 3531b717

drivers/spi/spi-coldfire-qspi.c

+5 −4
Original line number Diff line number Diff line
@@ -473,8 +473,11 @@ static int mcfqspi_suspend(struct device *dev) 
{

	struct spi_master *master = dev_get_drvdata(dev);

	struct mcfqspi *mcfqspi = spi_master_get_devdata(master);

	int ret;



	spi_master_suspend(master);

	ret = spi_master_suspend(master);

	if (ret)

		return ret;



	clk_disable(mcfqspi->clk);
@@ -486,11 +489,9 @@ static int mcfqspi_resume(struct device *dev) 
	struct spi_master *master = dev_get_drvdata(dev);

	struct mcfqspi *mcfqspi = spi_master_get_devdata(master);



	spi_master_resume(master);



	clk_enable(mcfqspi->clk);



	return 0;

	return spi_master_resume(master);

}

#endif