Merge branch 'spi-4.21' into spi-5.0

This commit is contained in:
Mark Brown 2019-01-07 12:42:08 +00:00
commit 3c9bb6a639
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0

View File

@ -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);