| From a824334ee0f46503aae4d724c4cdf23e3ad3d16a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 1 Dec 2020 17:31:46 +0800 |
| Subject: i2c: xiic: fix reference leak when pm_runtime_get_sync fails |
| |
| From: Qinglang Miao <miaoqinglang@huawei.com> |
| |
| [ Upstream commit a85c5c7a3aa8041777ff691400b4046e56149fd3 ] |
| |
| The PM reference count is not expected to be incremented on |
| return in xiic_xfer and xiic_i2c_remove. |
| |
| 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: 10b17004a74c ("i2c: xiic: Fix the clocking across bind unbind") |
| 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-xiic.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c |
| index 087b2951942e..2a8568b97c14 100644 |
| --- a/drivers/i2c/busses/i2c-xiic.c |
| +++ b/drivers/i2c/busses/i2c-xiic.c |
| @@ -706,7 +706,7 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) |
| dev_dbg(adap->dev.parent, "%s entry SR: 0x%x\n", __func__, |
| xiic_getreg8(i2c, XIIC_SR_REG_OFFSET)); |
| |
| - err = pm_runtime_get_sync(i2c->dev); |
| + err = pm_runtime_resume_and_get(i2c->dev); |
| if (err < 0) |
| return err; |
| |
| @@ -873,7 +873,7 @@ static int xiic_i2c_remove(struct platform_device *pdev) |
| /* remove adapter & data */ |
| i2c_del_adapter(&i2c->adap); |
| |
| - ret = pm_runtime_get_sync(i2c->dev); |
| + ret = pm_runtime_resume_and_get(i2c->dev); |
| if (ret < 0) |
| return ret; |
| |
| -- |
| 2.30.2 |
| |
