OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a042184
)
spi: bcm63xx-hsspi: fix missing clk_disable_unprepare() on error in bcm63xx_hsspi_resume
author
Qinglang Miao
<miaoqinglang@huawei.com>
Tue, 3 Nov 2020 07:49:11 +0000
(15:49 +0800)
committer
Mark Brown
<broonie@kernel.org>
Mon, 9 Nov 2020 19:44:30 +0000
(19:44 +0000)
Fix the missing clk_disable_unprepare() before return
from bcm63xx_hsspi_resume in the error handling case when
fails to prepare and enable bs->pll_clk.
Fixes:
0fd85869c2a9
("spi/bcm63xx-hsspi: keep pll clk enabled")
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
Link:
https://lore.kernel.org/r/20201103074911.195530-1-miaoqinglang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-bcm63xx-hsspi.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-bcm63xx-hsspi.c
b/drivers/spi/spi-bcm63xx-hsspi.c
index
9909b18
..
1f08d75
100644
(file)
--- a/
drivers/spi/spi-bcm63xx-hsspi.c
+++ b/
drivers/spi/spi-bcm63xx-hsspi.c
@@
-494,8
+494,10
@@
static int bcm63xx_hsspi_resume(struct device *dev)
if (bs->pll_clk) {
ret = clk_prepare_enable(bs->pll_clk);
- if (ret)
+ if (ret) {
+ clk_disable_unprepare(bs->clk);
return ret;
+ }
}
spi_master_resume(master);