diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-20 19:23:19 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-20 19:23:19 +0100 |
| commit | 86085fe79e3c1a66e32f2acae0ae64f4cceb8d28 (patch) | |
| tree | 42eb1f01a26b4da5ab8acfda76ddbd4936a186b1 /drivers/spi | |
| parent | Merge tag 'regulator-fix-v5.16-rc6' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | spi: change clk_disable_unprepare to clk_unprepare (diff) | |
| download | linux-86085fe79e3c1a66e32f2acae0ae64f4cceb8d28.tar.xz linux-86085fe79e3c1a66e32f2acae0ae64f4cceb8d28.zip | |
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
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-armada-3700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c index 46feafe4e201..d8cc4b270644 100644 --- a/drivers/spi/spi-armada-3700.c +++ b/drivers/spi/spi-armada-3700.c @@ -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: |