| From 7a2bbd232fad939217bb061eafc3409534fdc875 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 1 Dec 2020 17:31:44 +0800 |
| Subject: i2c: sprd: fix reference leak when pm_runtime_get_sync fails |
| |
| From: Qinglang Miao <miaoqinglang@huawei.com> |
| |
| [ Upstream commit 3a4f326463117cee3adcb72999ca34a9aaafda93 ] |
| |
| The PM reference count is not expected to be incremented on |
| return in sprd_i2c_master_xfer() and sprd_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: 8b9ec0719834 ("i2c: Add Spreadtrum I2C controller driver") |
| 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-sprd.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c |
| index 2917fecf6c80..8ead7e021008 100644 |
| --- a/drivers/i2c/busses/i2c-sprd.c |
| +++ b/drivers/i2c/busses/i2c-sprd.c |
| @@ -290,7 +290,7 @@ static int sprd_i2c_master_xfer(struct i2c_adapter *i2c_adap, |
| struct sprd_i2c *i2c_dev = i2c_adap->algo_data; |
| int im, ret; |
| |
| - ret = pm_runtime_get_sync(i2c_dev->dev); |
| + ret = pm_runtime_resume_and_get(i2c_dev->dev); |
| if (ret < 0) |
| return ret; |
| |
| @@ -576,7 +576,7 @@ static int sprd_i2c_remove(struct platform_device *pdev) |
| struct sprd_i2c *i2c_dev = platform_get_drvdata(pdev); |
| int ret; |
| |
| - ret = pm_runtime_get_sync(i2c_dev->dev); |
| + ret = pm_runtime_resume_and_get(i2c_dev->dev); |
| if (ret < 0) |
| return ret; |
| |
| -- |
| 2.30.2 |
| |
