|
Takashi Iwai |
35b4ff |
From 223125e37af8a641ea4a09747a6a52172fc4b903 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
35b4ff |
From: Qinglang Miao <miaoqinglang@huawei.com>
|
|
Takashi Iwai |
35b4ff |
Date: Tue, 1 Dec 2020 17:31:39 +0800
|
|
Takashi Iwai |
35b4ff |
Subject: [PATCH] i2c: img-scb: fix reference leak when pm_runtime_get_sync fails
|
|
Takashi Iwai |
35b4ff |
Git-commit: 223125e37af8a641ea4a09747a6a52172fc4b903
|
|
Takashi Iwai |
35b4ff |
Patch-mainline: v5.13-rc1
|
|
Takashi Iwai |
35b4ff |
References: git-fixes
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
The PM reference count is not expected to be incremented on
|
|
Takashi Iwai |
35b4ff |
return in functions img_i2c_xfer and img_i2c_init.
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
However, pm_runtime_get_sync will increment the PM reference
|
|
Takashi Iwai |
35b4ff |
count even failed. Forgetting to putting operation will result
|
|
Takashi Iwai |
35b4ff |
in a reference leak here.
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
Replace it with pm_runtime_resume_and_get to keep usage
|
|
Takashi Iwai |
35b4ff |
counter balanced.
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
Fixes: 93222bd9b966 ("i2c: img-scb: Add runtime PM")
|
|
Takashi Iwai |
35b4ff |
Reported-by: Hulk Robot <hulkci@huawei.com>
|
|
Takashi Iwai |
35b4ff |
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
|
|
Takashi Iwai |
35b4ff |
Signed-off-by: Wolfram Sang <wsa@kernel.org>
|
|
Takashi Iwai |
35b4ff |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
---
|
|
Takashi Iwai |
35b4ff |
drivers/i2c/busses/i2c-img-scb.c | 4 ++--
|
|
Takashi Iwai |
35b4ff |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
diff --git a/drivers/i2c/busses/i2c-img-scb.c b/drivers/i2c/busses/i2c-img-scb.c
|
|
Takashi Iwai |
35b4ff |
index 98a89301ed2a..8e987945ed45 100644
|
|
Takashi Iwai |
35b4ff |
--- a/drivers/i2c/busses/i2c-img-scb.c
|
|
Takashi Iwai |
35b4ff |
+++ b/drivers/i2c/busses/i2c-img-scb.c
|
|
Takashi Iwai |
35b4ff |
@@ -1057,7 +1057,7 @@ static int img_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
|
|
Takashi Iwai |
35b4ff |
atomic = true;
|
|
Takashi Iwai |
35b4ff |
}
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
- ret = pm_runtime_get_sync(adap->dev.parent);
|
|
Takashi Iwai |
35b4ff |
+ ret = pm_runtime_resume_and_get(adap->dev.parent);
|
|
Takashi Iwai |
35b4ff |
if (ret < 0)
|
|
Takashi Iwai |
35b4ff |
return ret;
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
@@ -1158,7 +1158,7 @@ static int img_i2c_init(struct img_i2c *i2c)
|
|
Takashi Iwai |
35b4ff |
u32 rev;
|
|
Takashi Iwai |
35b4ff |
int ret;
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
- ret = pm_runtime_get_sync(i2c->adap.dev.parent);
|
|
Takashi Iwai |
35b4ff |
+ ret = pm_runtime_resume_and_get(i2c->adap.dev.parent);
|
|
Takashi Iwai |
35b4ff |
if (ret < 0)
|
|
Takashi Iwai |
35b4ff |
return ret;
|
|
Takashi Iwai |
35b4ff |
|
|
Takashi Iwai |
35b4ff |
--
|
|
Takashi Iwai |
35b4ff |
2.26.2
|
|
Takashi Iwai |
35b4ff |
|