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

Commit f17414c4 authored by Sourav Poddar's avatar Sourav Poddar Committed by Mark Brown
Browse files

spi/qspi: Fix runtime resume path 



Due to the following commit
commit 160a0613
Author: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date:   Mon Nov 11 14:13:41 2013 +0800

    spi/qspi: set correct platform drvdata in ti_qspi_probe()

    The ti_qspi_remove() use the platform drvdata as a type of
    struct ti_qspi, we should pass correct platform drvdata to
    platform_set_drvdata() in ti_qspi_probe().

    Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
    Signed-off-by: default avatarMark Brown <broonie@linaro.org>

platform_set_drvdata was changed in  the probe, so we need to
correspondingly change deferencing of qspi in runtime resume
path. Else, this will lead to a NULL dereference pointer.

Based on v3.13-rc3

Signed-off-by: default avatarSourav Poddar <sourav.poddar@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 374b1057

drivers/spi/spi-ti-qspi.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -417,10 +417,8 @@ static irqreturn_t ti_qspi_isr(int irq, void *dev_id) 
static int ti_qspi_runtime_resume(struct device *dev)

static int ti_qspi_runtime_resume(struct device *dev)

{

{

	struct ti_qspi      *qspi;

	struct ti_qspi      *qspi;

	struct spi_master       *master;





	master = dev_get_drvdata(dev);

	qspi = dev_get_drvdata(dev);

	qspi = spi_master_get_devdata(master);

	ti_qspi_restore_ctx(qspi);

	ti_qspi_restore_ctx(qspi);





	return 0;

	return 0;