summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2022-01-14 07:26:38 +0300
committerJoel Stanley <joel@jms.id.au>2022-01-14 07:26:45 +0300
commita86c6a512f98e00938183ab1bb4504859a294433 (patch)
tree4279e934970303f820d3df34af16b9c24b6b5d60 /drivers/spi
parent2df0c7463236a6e19f020b0879285cac0e60c2f0 (diff)
parentd114b082bef784345bfac1e1d5c17257005284f2 (diff)
downloadlinux-a86c6a512f98e00938183ab1bb4504859a294433.tar.xz
Merge tag 'v5.15.14' into dev-5.15
This is the 5.15.14 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-armada-3700.c2
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: