i2c: stm32f7: fix reference leak when pm_runtime_get_sync fails

[ Upstream commit 2c662660ce2bd3b09dae21a9a9ac9395e1e6c00b ]

The PM reference count is not expected to be incremented on
return in these stm32f7_i2c_xx serious functions.

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: ea6dd25deeb5 ("i2c: stm32f7: add PM_SLEEP suspend/resume support")
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>

diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index 473fbe144b7e3396d8d5cf1321177f0f4971707d..8e2c65f91a67dc557e1c8d18c6dc1e6a40fde6b3 100644 (file)
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -1652,7 +1652,7 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap,
        i2c_dev->msg_id = 0;
        f7_msg->smbus = false;
 
-       ret = pm_runtime_get_sync(i2c_dev->dev);
+       ret = pm_runtime_resume_and_get(i2c_dev->dev);
        if (ret < 0)
                return ret;
 
@@ -1698,7 +1698,7 @@ static int stm32f7_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
        f7_msg->read_write = read_write;
        f7_msg->smbus = true;
 
-       ret = pm_runtime_get_sync(dev);
+       ret = pm_runtime_resume_and_get(dev);
        if (ret < 0)
                return ret;
 
@@ -1799,7 +1799,7 @@ static int stm32f7_i2c_reg_slave(struct i2c_client *slave)
        if (ret)
                return ret;
 
-       ret = pm_runtime_get_sync(dev);
+       ret = pm_runtime_resume_and_get(dev);
        if (ret < 0)
                return ret;
 
@@ -1880,7 +1880,7 @@ static int stm32f7_i2c_unreg_slave(struct i2c_client *slave)
 
        WARN_ON(!i2c_dev->slave[id]);
 
-       ret = pm_runtime_get_sync(i2c_dev->dev);
+       ret = pm_runtime_resume_and_get(i2c_dev->dev);
        if (ret < 0)
                return ret;
 
@@ -2277,7 +2277,7 @@ static int stm32f7_i2c_regs_backup(struct stm32f7_i2c_dev *i2c_dev)
        int ret;
        struct stm32f7_i2c_regs *backup_regs = &i2c_dev->backup_regs;
 
-       ret = pm_runtime_get_sync(i2c_dev->dev);
+       ret = pm_runtime_resume_and_get(i2c_dev->dev);
        if (ret < 0)
                return ret;
 
@@ -2299,7 +2299,7 @@ static int stm32f7_i2c_regs_restore(struct stm32f7_i2c_dev *i2c_dev)
        int ret;
        struct stm32f7_i2c_regs *backup_regs = &i2c_dev->backup_regs;
 
-       ret = pm_runtime_get_sync(i2c_dev->dev);
+       ret = pm_runtime_resume_and_get(i2c_dev->dev);
        if (ret < 0)
                return ret;