mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 23:52:08 +02:00
Merge branch 'spi-4.21' into spi-5.0
This commit is contained in:
commit
3c9bb6a639
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user