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

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

spi: coldfire-qspi: Fix getting correct address for *mcfqspi 



dev_get_drvdata() returns the address of master rather than mcfqspi.

Fixes: af361079 (spi/coldfire-qspi: Drop extra calls to spi_master_get in suspend/resume functions)
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
parent 38dbfb59

drivers/spi/spi-coldfire-qspi.c

+4 −2
Original line number Diff line number Diff line
@@ -514,7 +514,8 @@ static int mcfqspi_resume(struct device *dev) 
#ifdef CONFIG_PM_RUNTIME

static int mcfqspi_runtime_suspend(struct device *dev)

{

	struct mcfqspi *mcfqspi = dev_get_drvdata(dev);

	struct spi_master *master = dev_get_drvdata(dev);

	struct mcfqspi *mcfqspi = spi_master_get_devdata(master);



	clk_disable(mcfqspi->clk);
@@ -523,7 +524,8 @@ static int mcfqspi_runtime_suspend(struct device *dev) 


static int mcfqspi_runtime_resume(struct device *dev)

{

	struct mcfqspi *mcfqspi = dev_get_drvdata(dev);

	struct spi_master *master = dev_get_drvdata(dev);

	struct mcfqspi *mcfqspi = spi_master_get_devdata(master);



	clk_enable(mcfqspi->clk);