aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Qilong <zhangqilong3@huawei.com>2020-11-02 22:58:35 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 11:53:06 +0100
commit851228fd1f6782e89b02b0d4f8b25db75b8881c6 (patch)
treeb2fa9b3f659290958ff7ae25ebca6398f1868c94
parentb8c65a716e8d862210394d76d492e0dc74f31ac3 (diff)
downloadkernel_replicant_linux-851228fd1f6782e89b02b0d4f8b25db75b8881c6.tar.gz
kernel_replicant_linux-851228fd1f6782e89b02b0d4f8b25db75b8881c6.tar.bz2
kernel_replicant_linux-851228fd1f6782e89b02b0d4f8b25db75b8881c6.zip
spi: imx: fix reference leak in two imx operations
[ Upstream commit 1dcbdd944824369d4569959f8130336fe6fe5f39 ] pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to pm_runtime_put_noidle will result in reference leak in callers(spi_imx_prepare_message and spi_imx_remove), so we should fix it. Fixes: 525c9e5a32bd7 ("spi: imx: enable runtime pm support") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Link: https://lore.kernel.org/r/20201102145835.4765-1-zhangqilong3@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/spi/spi-imx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 0b597905ee72..8df5e973404f 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1538,6 +1538,7 @@ spi_imx_prepare_message(struct spi_master *master, struct spi_message *msg)
ret = pm_runtime_get_sync(spi_imx->dev);
if (ret < 0) {
+ pm_runtime_put_noidle(spi_imx->dev);
dev_err(spi_imx->dev, "failed to enable clock\n");
return ret;
}
@@ -1748,6 +1749,7 @@ static int spi_imx_remove(struct platform_device *pdev)
ret = pm_runtime_get_sync(spi_imx->dev);
if (ret < 0) {
+ pm_runtime_put_noidle(spi_imx->dev);
dev_err(spi_imx->dev, "failed to enable clock\n");
return ret;
}