spi: stm32-qspi: fix reference leak in stm32 qspi operations

[ Upstream commit 88e1419b5e ]

pm_runtime_get_sync will increment pm usage counter even it
failed. Forgetting to pm_runtime_put_noidle will result in
reference leak in two callers(stm32_qspi_exec_op and
stm32_qspi_setup), so we should fix it.

Fixes: 9d282c17b0 ("spi: stm32-qspi: Add pm_runtime support")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
Link: https://lore.kernel.org/r/20201106015357.141235-1-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zhang Qilong 2020-11-06 09:53:57 +08:00 committed by Greg Kroah-Hartman
parent f48dbf5152
commit ea5ee372c7

View file

@ -434,8 +434,10 @@ static int stm32_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
int ret; int ret;
ret = pm_runtime_get_sync(qspi->dev); ret = pm_runtime_get_sync(qspi->dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put_noidle(qspi->dev);
return ret; return ret;
}
mutex_lock(&qspi->lock); mutex_lock(&qspi->lock);
ret = stm32_qspi_send(mem, op); ret = stm32_qspi_send(mem, op);
@ -462,8 +464,10 @@ static int stm32_qspi_setup(struct spi_device *spi)
return -EINVAL; return -EINVAL;
ret = pm_runtime_get_sync(qspi->dev); ret = pm_runtime_get_sync(qspi->dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put_noidle(qspi->dev);
return ret; return ret;
}
presc = DIV_ROUND_UP(qspi->clk_rate, spi->max_speed_hz) - 1; presc = DIV_ROUND_UP(qspi->clk_rate, spi->max_speed_hz) - 1;