Merge tag 'spi-fix-v6.8-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

torvalds · torvalds · commit a638bfbfa1f8 · 2024-01-19T12:50:09.000-08:00
Pull spi fix from Mark Brown:
 "One simple fix for the device unbind path in the Coldfire driver.

  A conversion to use a combined get/enable helper missed removing a
  disable"

* tag 'spi-fix-v6.8-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: coldfire-qspi: Remove an erroneous clk_disable_unprepare() from the remove function
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
@@ -441,7 +441,6 @@ static void mcfqspi_remove(struct platform_device *pdev)
 	mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR);
 
 	mcfqspi_cs_teardown(mcfqspi);
-	clk_disable_unprepare(mcfqspi->clk);
 }
 
 #ifdef CONFIG_PM_SLEEP

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,6 @@ static void mcfqspi_remove(struct platform_device *pdev)`
`441`	`441`	`mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR);`
`442`	`442`
`443`	`443`	`mcfqspi_cs_teardown(mcfqspi);`
`444`		`- clk_disable_unprepare(mcfqspi->clk);`
`445`	`444`	`}`
`446`	`445`
`447`	`446`	`#ifdef CONFIG_PM_SLEEP`