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

Wolfram Sang · Wolfram Sang · commit 3689245dedfd · 2024-10-04T18:30:37.000+02:00
i2c-host fixes for v6.12-rc2

In the stm32f7 a potential deadlock is fixed during runtime
suspend and resume.
diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
@@ -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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2395,7 +2395,7 @@ static int __maybe_unused stm32f7_i2c_runtime_suspend(struct device *dev)`
`2395`	`2395`	`struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev);`
`2396`	`2396`
`2397`	`2397`	`if (!stm32f7_i2c_is_slave_registered(i2c_dev))`
`2398`		`- clk_disable_unprepare(i2c_dev->clk);`
	`2398`	`+ clk_disable(i2c_dev->clk);`
`2399`	`2399`
`2400`	`2400`	`return 0;`
`2401`	`2401`	`}`
`@@ -2406,9 +2406,9 @@ static int __maybe_unused stm32f7_i2c_runtime_resume(struct device *dev)`
`2406`	`2406`	`int ret;`
`2407`	`2407`
`2408`	`2408`	`if (!stm32f7_i2c_is_slave_registered(i2c_dev)) {`
`2409`		`- ret = clk_prepare_enable(i2c_dev->clk);`
	`2409`	`+ ret = clk_enable(i2c_dev->clk);`
`2410`	`2410`	`if (ret) {`
`2411`		`- dev_err(dev, "failed to prepare_enable clock\n");`
	`2411`	`+ dev_err(dev, "failed to enable clock\n");`
`2412`	`2412`	`return ret;`
`2413`	`2413`	`}`
`2414`	`2414`	`}`