Commit 2c662660 authored by Qinglang Miao's avatar Qinglang Miao Committed by Wolfram Sang
Browse files

i2c: stm32f7: fix reference leak when pm_runtime_get_sync fails 



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: ea6dd25d ("i2c: stm32f7: add PM_SLEEP suspend/resume support")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarQinglang Miao <miaoqinglang@huawei.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 3a4f3264

drivers/i2c/busses/i2c-stm32f7.c

+6 −6
Original line number Diff line number Diff line
@@ -1660,7 +1660,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;
@@ -1706,7 +1706,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;
@@ -1807,7 +1807,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;
@@ -1888,7 +1888,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;
@@ -2276,7 +2276,7 @@ static int __maybe_unused stm32f7_i2c_regs_backup(struct stm32f7_i2c_dev *i2c_de 
	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;
@@ -2298,7 +2298,7 @@ static int __maybe_unused stm32f7_i2c_regs_restore(struct stm32f7_i2c_dev *i2c_d 
	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;