diff options
| author | Wolfram Sang <wsa@kernel.org> | 2023-09-19 16:56:46 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2023-09-19 16:56:46 +0200 |
| commit | c1ac8903f31f483089ef30546ed27a95d2a2fa35 (patch) | |
| tree | f4998939cb541c308621c77c576732b6993176f8 /drivers/i2c | |
| parent | 7890fce6201aed46d3576e3d641f9ee5c1f0e16f (diff) | |
| parent | 510f276df2b91efd73f6c53be62b7e692ff533c1 (diff) | |
| download | linux-c1ac8903f31f483089ef30546ed27a95d2a2fa35.tar.gz | |
Merge tag 'ib-mfd-i2c-reboot-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into i2c/for-mergewindow
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 1247e6e6e9751..05b8b8dfa9bdd 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) |