Commit 3689245d authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'i2c-host-fixes-6.12-rc2' of... 

Merge tag 'i2c-host-fixes-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current

i2c-host fixes for v6.12-rc2

In the stm32f7 a potential deadlock is fixed during runtime
suspend and resume.
parents 9852d85e 048bbbdb

drivers/i2c/busses/i2c-stm32f7.c

+3 −3
Original line number Diff line number Diff line
@@ -2395,7 +2395,7 @@ static int __maybe_unused stm32f7_i2c_runtime_suspend(struct device *dev) 
	struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev);



	if (!stm32f7_i2c_is_slave_registered(i2c_dev))

		clk_disable_unprepare(i2c_dev->clk);

		clk_disable(i2c_dev->clk);



	return 0;

}
@@ -2406,9 +2406,9 @@ static int __maybe_unused stm32f7_i2c_runtime_resume(struct device *dev) 
	int ret;



	if (!stm32f7_i2c_is_slave_registered(i2c_dev)) {

		ret = clk_prepare_enable(i2c_dev->clk);

		ret = clk_enable(i2c_dev->clk);

		if (ret) {

			dev_err(dev, "failed to prepare_enable clock\n");

			dev_err(dev, "failed to enable clock\n");

			return ret;

		}

	}