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")
Cc: stable@vger.kernel.org # v6.13+
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 drivers/i2c/busses/i2c-rtl9300.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9300.c
index 9e1f71fed0feac41e1534709de2406c7a63fa9cd..af991b28e4f83591a3212f7e5cf8137e36a7693a 100644
--- a/drivers/i2c/busses/i2c-rtl9300.c
+++ b/drivers/i2c/busses/i2c-rtl9300.c
@@ -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 = {

-- 
2.47.3

On Sat, Sep 27, 2025 at 11:52:16AM +0200, Sven Eckelmann wrote:
> 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")
> Cc: stable@vger.kernel.org # v6.13+
> Signed-off-by: Sven Eckelmann <sven@narfation.org>

Applied to for-current with $subject fixed to match the correct FUNC
flag, thanks!