diff options
| -rw-r--r-- | drivers/spi/spi-axi-spi-engine.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c index 6ab4c7700228..68cfc351b47f 100644 --- a/drivers/spi/spi-axi-spi-engine.c +++ b/drivers/spi/spi-axi-spi-engine.c | |||
| @@ -553,7 +553,7 @@ err_put_master: | |||
| 553 | 553 | ||
| 554 | static int spi_engine_remove(struct platform_device *pdev) | 554 | static int spi_engine_remove(struct platform_device *pdev) |
| 555 | { | 555 | { |
| 556 | struct spi_master *master = platform_get_drvdata(pdev); | 556 | struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); |
| 557 | struct spi_engine *spi_engine = spi_master_get_devdata(master); | 557 | struct spi_engine *spi_engine = spi_master_get_devdata(master); |
| 558 | int irq = platform_get_irq(pdev, 0); | 558 | int irq = platform_get_irq(pdev, 0); |
| 559 | 559 | ||
| @@ -561,6 +561,8 @@ static int spi_engine_remove(struct platform_device *pdev) | |||
| 561 | 561 | ||
| 562 | free_irq(irq, master); | 562 | free_irq(irq, master); |
| 563 | 563 | ||
| 564 | spi_master_put(master); | ||
| 565 | |||
| 564 | writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING); | 566 | writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING); |
| 565 | writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE); | 567 | writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE); |
| 566 | writel_relaxed(0x01, spi_engine->base + SPI_ENGINE_REG_RESET); | 568 | writel_relaxed(0x01, spi_engine->base + SPI_ENGINE_REG_RESET); |
