Commit 86085fe7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fix from Mark Brown:
 "One small fix for a long standing issue with error handling on probe
  in the Armada driver"

* tag 'spi-fix-v5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: change clk_disable_unprepare to clk_unprepare
parents 3856c1b3 db6689b6

drivers/spi/spi-armada-3700.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static int a3700_spi_probe(struct platform_device *pdev) 
	return 0;



error_clk:

	clk_disable_unprepare(spi->clk);

	clk_unprepare(spi->clk);

error:

	spi_master_put(master);

out: