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

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

spi: fsl-dspi: Fix getting correct address for master 



Current code set platform drvdata to dspi. However, the code in dspi_suspend()
and dspi_resume() assumes the drvdata is the address of master.
Fix it by setting platform drvdata to master.

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-fsl-dspi.c

+3 −3
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ static int dspi_suspend(struct device *dev) 


static int dspi_resume(struct device *dev)

{



	struct spi_master *master = dev_get_drvdata(dev);

	struct fsl_dspi *dspi = spi_master_get_devdata(master);
@@ -504,7 +503,7 @@ static int dspi_probe(struct platform_device *pdev) 
	clk_prepare_enable(dspi->clk);



	init_waitqueue_head(&dspi->waitq);

	platform_set_drvdata(pdev, dspi);

	platform_set_drvdata(pdev, master);



	ret = spi_bitbang_start(&dspi->bitbang);

	if (ret != 0) {
@@ -525,7 +524,8 @@ static int dspi_probe(struct platform_device *pdev) 


static int dspi_remove(struct platform_device *pdev)

{

	struct fsl_dspi *dspi = platform_get_drvdata(pdev);

	struct spi_master *master = platform_get_drvdata(pdev);

	struct fsl_dspi *dspi = spi_master_get_devdata(master);



	/* Disconnect from the SPI framework */

	spi_bitbang_stop(&dspi->bitbang);