forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume()

Browse source 
[ Upstream commit 70034320fd ]

Add the missing clk_disable_unprepare() before return
from spi_qup_resume() in the error handling case.

Fixes: 64ff247a97 (“spi: Add Qualcomm QUP SPI controller support”)
Signed-off-by: Xu Qiang <xuqiang36@huawei.com>
Link: https://lore.kernel.org/r/20220825065324.68446-1-xuqiang36@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Xu Qiang 2022-08-25 06:53:23 +00:00 • committed by Greg Kroah-Hartman
commit 7b83d11d48
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/spi/spi-qup.c
View file

@ -1246,14 +1246,25 @@ static int spi_qup_resume(struct device *device)
return ret; return ret;
ret = clk_prepare_enable(controller->cclk); ret = clk_prepare_enable(controller->cclk);
if (ret) if (ret) {
clk_disable_unprepare(controller->iclk);
return ret; return ret;
}
ret = spi_qup_set_state(controller, QUP_STATE_RESET); ret = spi_qup_set_state(controller, QUP_STATE_RESET);
if (ret) if (ret)
return ret; goto disable_clk;
return spi_master_resume(master); ret = spi_master_resume(master);
if (ret)
goto disable_clk;
return 0;
disable_clk:
clk_disable_unprepare(controller->cclk);
clk_disable_unprepare(controller->iclk);
return ret;
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */