Skip to content

Commit 3a28c9e

Browse files
committed
Merge tag 'i2c-for-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang: - Fix potential deadlock during runtime suspend and resume (stm32f7) * tag 'i2c-for-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: stm32f7: Do not prepare/unprepare clock during runtime suspend/resume
2 parents 60b9f47 + 3689245 commit 3a28c9e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/i2c/busses/i2c-stm32f7.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2395,7 +2395,7 @@ static int __maybe_unused stm32f7_i2c_runtime_suspend(struct device *dev)
23952395
struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev);
23962396

23972397
if (!stm32f7_i2c_is_slave_registered(i2c_dev))
2398-
clk_disable_unprepare(i2c_dev->clk);
2398+
clk_disable(i2c_dev->clk);
23992399

24002400
return 0;
24012401
}
@@ -2406,9 +2406,9 @@ static int __maybe_unused stm32f7_i2c_runtime_resume(struct device *dev)
24062406
int ret;
24072407

24082408
if (!stm32f7_i2c_is_slave_registered(i2c_dev)) {
2409-
ret = clk_prepare_enable(i2c_dev->clk);
2409+
ret = clk_enable(i2c_dev->clk);
24102410
if (ret) {
2411-
dev_err(dev, "failed to prepare_enable clock\n");
2411+
dev_err(dev, "failed to enable clock\n");
24122412
return ret;
24132413
}
24142414
}

0 commit comments

Comments
 (0)