diff options
| author | Lee Jones <lee@kernel.org> | 2023-11-01 10:00:28 +0000 |
|---|---|---|
| committer | Lee Jones <lee@kernel.org> | 2023-11-01 10:00:28 +0000 |
| commit | 55bb1a507fe3940fb2db99077d9e31046ad52247 (patch) | |
| tree | fa6c6db47f01ed25bfcfb173672b9d4b687b108a /drivers/i2c | |
| parent | 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (diff) | |
| parent | 510f276df2b91efd73f6c53be62b7e692ff533c1 (diff) | |
Merge tag 'ib-mfd-i2c-reboot-v6.7' into ibs-for-mfd-merged
Immutable branch between MFD, I2C and Reboot due for the v6.7 merge window
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h index 1247e6e6e975..05b8b8dfa9bd 100644 --- a/drivers/i2c/i2c-core.h +++ b/drivers/i2c/i2c-core.h @@ -29,7 +29,7 @@ int i2c_dev_irq_from_resources(const struct resource *resources, */ static inline bool i2c_in_atomic_xfer_mode(void) { - return system_state > SYSTEM_RUNNING && irqs_disabled(); + return system_state > SYSTEM_RUNNING && !preemptible(); } static inline int __i2c_lock_bus_helper(struct i2c_adapter *adap) |