diff options
| author | Qinglang Miao <miaoqinglang@huawei.com> | 2020-11-03 15:49:11 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 11:53:06 +0100 |
| commit | b8c65a716e8d862210394d76d492e0dc74f31ac3 (patch) | |
| tree | 1414ce1c2cb1208b3786c9c061eb8c56aa0849e0 | |
| parent | d7dc725c7eb4ead569ee2dee9c4a8fd3c1f28fd3 (diff) | |
| download | kernel_replicant_linux-b8c65a716e8d862210394d76d492e0dc74f31ac3.tar.gz kernel_replicant_linux-b8c65a716e8d862210394d76d492e0dc74f31ac3.tar.bz2 kernel_replicant_linux-b8c65a716e8d862210394d76d492e0dc74f31ac3.zip | |
spi: bcm63xx-hsspi: fix missing clk_disable_unprepare() on error in bcm63xx_hsspi_resume
[ Upstream commit 9bb9ef2b3e5d9d012876e7e2d7757eb30e865bee ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/spi/spi-bcm63xx-hsspi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c index 9909b18f3c5a..1f08d7553f07 100644 --- 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); |