2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
index 0403ec1dc3b5..fc89c13b1632 100644
--- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c
+++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
@@ -94,7 +94,7 @@ static int ec_i2c_construct_message(u8 *buf, const struct i2c_msg i2c_msgs[],
                 msg->addr_flags = i2c_msg->addr;
 
                 if (i2c_msg->flags & I2C_M_TEN)
-                        msg->addr_flags |= EC_I2C_FLAG_10BIT;
+                        return -EINVAL;
 
                 if (i2c_msg->flags & I2C_M_RD) {
                         msg->addr_flags |= EC_I2C_FLAG_READ;
@@ -218,7 +218,9 @@ static int ec_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg i2c_msgs[],
                 }
         }
 
-        ec_i2c_construct_message(request, i2c_msgs, num, bus_num);
+        result = ec_i2c_construct_message(request, i2c_msgs, num, bus_num);
+        if (result)
+                goto exit;
 
         msg.version = 0;
         msg.command = EC_CMD_I2C_PASSTHRU;
diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h
index 7853a6410d14..a49cd41feea7 100644
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
@@ -1928,9 +1928,6 @@ struct ec_response_power_info {
 
 #define EC_CMD_I2C_PASSTHRU 0x9e
 
-/* Slave address is 10 (not 7) bit */
-#define EC_I2C_FLAG_10BIT       (1 << 16)
-
 /* Read data; if not present, message is a write */
 #define EC_I2C_FLAG_READ        (1 << 15)