| Message ID | 20220825065324.68446-1-xuqiang36@huawei.com |
|---|---|
| State | Accepted |
| Commit | 70034320fdc597b8f58b4a43bb547f17c4c5557a |
| Headers | show |
| Series | [-next,1/2] spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume() | expand |
On Thu, 25 Aug 2022 06:53:23 +0000, Xu Qiang wrote: > Add the missing clk_disable_unprepare() before return > from spi_qup_resume() in the error handling case. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/2] spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume() commit: 70034320fdc597b8f58b4a43bb547f17c4c5557a [2/2] spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime() commit: 494a22765ce479c9f8ad181c5d24cffda9f534bb All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 00d6084306b4..ae4e67f152ec 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -1245,14 +1245,25 @@ static int spi_qup_resume(struct device *device) return ret; ret = clk_prepare_enable(controller->cclk); - if (ret) + if (ret) { + clk_disable_unprepare(controller->iclk); return ret; + } ret = spi_qup_set_state(controller, QUP_STATE_RESET); if (ret) - return ret; + goto disable_clk; + + ret = spi_master_resume(master); + if (ret) + goto disable_clk; - return spi_master_resume(master); + return 0; + +disable_clk: + clk_disable_unprepare(controller->cclk); + clk_disable_unprepare(controller->iclk); + return ret; } #endif /* CONFIG_PM_SLEEP */
Add the missing clk_disable_unprepare() before return from spi_qup_resume() in the error handling case. Fixes: 64ff247a978f (“spi: Add Qualcomm QUP SPI controller support”) Signed-off-by: Xu Qiang <xuqiang36@huawei.com> --- drivers/spi/spi-qup.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)