Skip to content

Commit

Permalink
Merge tag 'spi-fix-v5.16-rc6' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/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
  • Loading branch information
Linus Torvalds committed Dec 20, 2021
2 parents 3856c1b + db6689b commit 86085fe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/spi/spi-armada-3700.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 86085fe

Please sign in to comment.