diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:01:10 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:01:10 +0100 |
| commit | 7de24430cd280ca9d19d52a02bf2952601da2897 (patch) | |
| tree | 31c4b3399cf163774cc2d1c7de676e34d8b46170 /drivers/i2c | |
| parent | 675b3306545c75cd31ff3f66ae655907d43058d4 (diff) | |
| parent | ddcaf49990615eb5659e8f06f5bab4bc3d65c4a5 (diff) | |
Merge tag 'v5.15.147' into fslc-5.15-2.2.x-imx
This is the 5.15.147 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h index ea17f13b44c8..ec28024a646d 100644 --- a/drivers/i2c/i2c-core.h +++ b/drivers/i2c/i2c-core.h @@ -3,6 +3,7 @@ * i2c-core.h - interfaces internal to the I2C framework */ +#include <linux/kconfig.h> #include <linux/rwsem.h> struct i2c_devinfo { @@ -29,7 +30,8 @@ int i2c_dev_irq_from_resources(const struct resource *resources, */ static inline bool i2c_in_atomic_xfer_mode(void) { - return system_state > SYSTEM_RUNNING && !preemptible(); + return system_state > SYSTEM_RUNNING && + (IS_ENABLED(CONFIG_PREEMPT_COUNT) ? !preemptible() : irqs_disabled()); } static inline int __i2c_lock_bus_helper(struct i2c_adapter *adap) |