diff options
| author | Mark Brown <broonie@kernel.org> | 2019-02-20 17:58:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-20 17:58:18 +0000 |
| commit | bf9f742c38c4604a8ee349f7baefca58b3a5ff67 (patch) | |
| tree | fa4d349e4a843bf5543f6e7ab6e73dce1eda10e9 /drivers/spi/spi-npcm-pspi.c | |
| parent | 484a9a68d669f899657a97dbb369cb3e3be7e7f5 (diff) | |
| parent | ef070b4e4aa25bb5f8632ad196644026c11903bf (diff) | |
| download | linux-next-bf9f742c38c4604a8ee349f7baefca58b3a5ff67.tar.gz | |
Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.1
Diffstat (limited to 'drivers/spi/spi-npcm-pspi.c')
| -rw-r--r-- | drivers/spi/spi-npcm-pspi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-npcm-pspi.c b/drivers/spi/spi-npcm-pspi.c index e1dca79b9090..734a2b956959 100644 --- a/drivers/spi/spi-npcm-pspi.c +++ b/drivers/spi/spi-npcm-pspi.c @@ -465,7 +465,8 @@ out_master_put: 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); |