Skip to content

Commit e5c2749

Browse files
claudiubezneabroonie
authored andcommitted
spi: atmel-quadspi: fix crash while suspending
atmel_qspi objects are kept in spi_controller objects, so, first get pointer to spi_controller object and then get atmel_qspi object from spi_controller object. Fixes: 2d30ac5 ("mtd: spi-nor: atmel-quadspi: Use spi-mem interface for atmel-quadspi driver") Signed-off-by: Claudiu Beznea <[email protected]> Reviewed-by: Tudor Ambarus <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 8d1467a commit e5c2749

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/spi/atmel-quadspi.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,8 @@ static int atmel_qspi_remove(struct platform_device *pdev)
570570

571571
static int __maybe_unused atmel_qspi_suspend(struct device *dev)
572572
{
573-
struct atmel_qspi *aq = dev_get_drvdata(dev);
573+
struct spi_controller *ctrl = dev_get_drvdata(dev);
574+
struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);
574575

575576
clk_disable_unprepare(aq->qspick);
576577
clk_disable_unprepare(aq->pclk);
@@ -580,7 +581,8 @@ static int __maybe_unused atmel_qspi_suspend(struct device *dev)
580581

581582
static int __maybe_unused atmel_qspi_resume(struct device *dev)
582583
{
583-
struct atmel_qspi *aq = dev_get_drvdata(dev);
584+
struct spi_controller *ctrl = dev_get_drvdata(dev);
585+
struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);
584586

585587
clk_prepare_enable(aq->pclk);
586588
clk_prepare_enable(aq->qspick);

0 commit comments

Comments
 (0)