diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2019-04-03 15:40:09 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2019-04-16 14:08:11 +0300 |
| commit | 83c42212d2544625b85f44a07d0ad96323e69250 (patch) | |
| tree | f9fbca3a009f6e40eecce87ed42fc49eeef059dd /drivers/i2c/i2c-core-smbus.c | |
| parent | bae1d3a05a8b99bd748168bbf8155a1d047c562e (diff) | |
| download | linux-83c42212d2544625b85f44a07d0ad96323e69250.tar.xz | |
i2c: core: use I2C locking behaviour also for SMBUS
If I2C transfers are executed in atomic contexts, trylock is used
instead of lock. This behaviour was missing for SMBUS, although a lot of
transfers are of SMBUS type, either emulated or direct. So, factor out
the locking routine into a helper and use it for I2C and SMBUS.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/i2c-core-smbus.c')
| -rw-r--r-- | drivers/i2c/i2c-core-smbus.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core-smbus.c b/drivers/i2c/i2c-core-smbus.c index 132119112596..357e083e8f45 100644 --- a/drivers/i2c/i2c-core-smbus.c +++ b/drivers/i2c/i2c-core-smbus.c @@ -20,6 +20,8 @@ #include <linux/i2c-smbus.h> #include <linux/slab.h> +#include "i2c-core.h" + #define CREATE_TRACE_POINTS #include <trace/events/smbus.h> @@ -530,7 +532,10 @@ s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, { s32 res; - i2c_lock_bus(adapter, I2C_LOCK_SEGMENT); + res = __i2c_lock_bus_helper(adapter); + if (res) + return res; + res = __i2c_smbus_xfer(adapter, addr, flags, read_write, command, protocol, data); i2c_unlock_bus(adapter, I2C_LOCK_SEGMENT); |