Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+3 -3
+3 -3
drivers/i2c/busses/i2c-stm32f7.c
··· 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 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 }