Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3c9bb6a6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'spi-4.21' into spi-5.0

parents bfeffd15 08253144
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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);