Commit a638bfbf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents a1fe5b6d 17dc11a0

drivers/spi/spi-coldfire-qspi.c

+0 −1
Original line number Diff line number Diff line
@@ -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