Commit 09553051 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Wolfram Sang
Browse files

i2c: rtl9300: Drop unsupported I2C_FUNC_SMBUS_I2C_BLOCK 



While applying the patch for commit ede965fd ("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: ede965fd ("i2c: rtl9300: remove broken SMBus Quick operation support")
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent ed45b7a4

drivers/i2c/busses/i2c-rtl9300.c

+1 −2
Original line number Diff line number Diff line
@@ -307,8 +307,7 @@ static int rtl9300_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned s 
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 = {