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

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
...@@ -901,7 +901,7 @@ static int a3700_spi_probe(struct platform_device *pdev) ...@@ -901,7 +901,7 @@ static int a3700_spi_probe(struct platform_device *pdev)
return 0; return 0;
error_clk: error_clk:
clk_disable_unprepare(spi->clk); clk_unprepare(spi->clk);
error: error:
spi_master_put(master); spi_master_put(master);
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment