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