Unverified Commit 70034320 authored by Xu Qiang's avatar Xu Qiang Committed by Mark Brown
Browse files

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



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

Fixes: 64ff247a (“spi: Add Qualcomm QUP SPI controller support”)
Signed-off-by: default avatarXu Qiang <xuqiang36@huawei.com>
Link: https://lore.kernel.org/r/20220825065324.68446-1-xuqiang36@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c9448aa4
Loading
Loading
Loading
Loading
+14 −3
Original line number Diff line number Diff line
@@ -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 0;

	return spi_master_resume(master);
disable_clk:
	clk_disable_unprepare(controller->cclk);
	clk_disable_unprepare(controller->iclk);
	return ret;
}
#endif /* CONFIG_PM_SLEEP */