diff options
| author | Mark Brown <broonie@kernel.org> | 2019-01-07 12:42:08 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-01-07 12:42:08 +0000 |
| commit | 3c9bb6a639d0b2a45ef8aac1dd3581522814ad0c (patch) | |
| tree | 2e85d44bed698ad3055716e59092a705dd8efc62 /drivers/spi | |
| parent | bfeffd155283772bbe78c6a05dec7c0128ee500c (diff) | |
| parent | 082531444e454bac6f743ec064203bf8812bc9ac (diff) | |
Merge branch 'spi-4.21' into spi-5.0
Diffstat (limited to 'drivers/spi')
| -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); |