diff options
| author | Kunihiko Hayashi <hayashi.kunihiko@socionext.com> | 2021-12-22 05:48:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-12-22 13:42:51 +0100 |
| commit | 80bb73a9fbcde4ecc55e12f10c73fabbe68a24d1 (patch) | |
| tree | 153a37cd4c4ff4357c30c147507a46c44d761f3b /drivers/spi | |
| parent | spi: change clk_disable_unprepare to clk_unprepare (diff) | |
| download | linux-80bb73a9fbcde4ecc55e12f10c73fabbe68a24d1.tar.xz linux-80bb73a9fbcde4ecc55e12f10c73fabbe68a24d1.zip | |
spi: uniphier: Fix a bug that doesn't point to private data correctly
In uniphier_spi_remove(), there is a wrong code to get private data from
the platform device, so the driver can't be removed properly.
The driver should get spi_master from the platform device and retrieve
the private data from it.
Cc: <stable@vger.kernel.org>
Fixes: 5ba155a4d4cc ("spi: add SPI controller driver for UniPhier SoC")
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Link: https://lore.kernel.org/r/1640148492-32178-1-git-send-email-hayashi.kunihiko@socionext.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-uniphier.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c index 8900e51e1a1c..342ee8d2c476 100644 --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -767,12 +767,13 @@ out_master_put: static int uniphier_spi_remove(struct platform_device *pdev) { - struct uniphier_spi_priv *priv = platform_get_drvdata(pdev); + struct spi_master *master = platform_get_drvdata(pdev); + struct uniphier_spi_priv *priv = spi_master_get_devdata(master); - if (priv->master->dma_tx) - dma_release_channel(priv->master->dma_tx); - if (priv->master->dma_rx) - dma_release_channel(priv->master->dma_rx); + if (master->dma_tx) + dma_release_channel(master->dma_tx); + if (master->dma_rx) + dma_release_channel(master->dma_rx); clk_disable_unprepare(priv->clk); |