diff options
| author | Sven Eckelmann <[email protected]> | 2025-09-27 09:52:16 +0000 |
|---|---|---|
| committer | Wolfram Sang <[email protected]> | 2025-09-27 22:23:34 +0000 |
| commit | 095530512152e6811278de9c30f170f0ac9705eb (patch) | |
| tree | cf4353132771a58b49bffc803ba8b66313f0dad3 /drivers/i2c | |
| parent | MAINTAINERS: add entry for SpacemiT K1 I2C driver (diff) | |
| download | kernel-095530512152e6811278de9c30f170f0ac9705eb.tar.gz kernel-095530512152e6811278de9c30f170f0ac9705eb.zip | |
i2c: rtl9300: Drop unsupported I2C_FUNC_SMBUS_I2C_BLOCK
While applying the patch for commit ede965fd555a ("i2c: rtl9300: remove
broken SMBus Quick operation support"), a conflict was incorrectly solved
by adding the I2C_FUNC_SMBUS_I2C_BLOCK feature flag. But the code to handle
I2C_SMBUS_I2C_BLOCK_DATA requests will be added by a separate commit.
Fixes: ede965fd555a ("i2c: rtl9300: remove broken SMBus Quick operation support")
Signed-off-by: Sven Eckelmann <[email protected]>
Signed-off-by: Wolfram Sang <[email protected]>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-rtl9300.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9300.c index 9e1f71fed0fe..af991b28e4f8 100644 --- a/drivers/i2c/busses/i2c-rtl9300.c +++ b/drivers/i2c/busses/i2c-rtl9300.c @@ -307,8 +307,7 @@ out_unlock: static u32 rtl9300_i2c_func(struct i2c_adapter *a) { return I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA | - I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA | - I2C_FUNC_SMBUS_I2C_BLOCK; + I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA; } static const struct i2c_algorithm rtl9300_i2c_algo = { |
