projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea7e1b5
)
spi: meson-spicc: fix a wrong goto jump for avoiding memory leak.
author
zpershuai
<zpershuai@gmail.com>
Sun, 13 Jun 2021 05:29:32 +0000
(13:29 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:55:54 +0000
(16:55 +0200)
[ Upstream commit
95730d5eb73170a6d225a9998c478be273598634
]
In meson_spifc_probe function, when enable the device pclk clock is
error, it should use clk_disable_unprepare to release the core clock.
Signed-off-by: zpershuai <zpershuai@gmail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Link:
https://lore.kernel.org/r/1623562172-22056-1-git-send-email-zpershuai@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/spi/spi-meson-spicc.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-meson-spicc.c
b/drivers/spi/spi-meson-spicc.c
index
ecba6b4
..
51aef2c
100644
(file)
--- a/
drivers/spi/spi-meson-spicc.c
+++ b/
drivers/spi/spi-meson-spicc.c
@@
-725,7
+725,7
@@
static int meson_spicc_probe(struct platform_device *pdev)
ret = clk_prepare_enable(spicc->pclk);
if (ret) {
dev_err(&pdev->dev, "pclk clock enable failed\n");
- goto out_
master
;
+ goto out_
core_clk
;
}
device_reset_optional(&pdev->dev);
@@
-764,9
+764,11
@@
static int meson_spicc_probe(struct platform_device *pdev)
return 0;
out_clk:
- clk_disable_unprepare(spicc->core);
clk_disable_unprepare(spicc->pclk);
+out_core_clk:
+ clk_disable_unprepare(spicc->core);
+
out_master:
spi_master_put(master);