Merge branch 'spi-4.21' into spi-5.0

3c9bb6a6 · Mark Brown · bfeffd15 · 08253144 · 3c9bb6a6
Commit 3c9bb6a6 authored Jan 07, 2019 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/spi/spi-npcm-pspi.c drivers/spi/spi-npcm-pspi.c +2 -1

No files found.
--- a/drivers/spi/spi-npcm-pspi.c
+++ b/drivers/spi/spi-npcm-pspi.c
@@ -465,7 +465,8 @@ static int npcm_pspi_probe(struct platform_device *pdev)

 static int npcm_pspi_remove(struct platform_device *pdev)
 {
-	struct npcm_pspi *priv = platform_get_drvdata(pdev);
+	struct spi_master *master = platform_get_drvdata(pdev);
+	struct npcm_pspi *priv = spi_master_get_devdata(master);

 	npcm_pspi_reset_hw(priv);
 	clk_disable_unprepare(priv->clk);