diff --git a/[refs] b/[refs]
index 6f3ee13a4a16..7e0753d7eee0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fea2021c76a414b71204cc2aea623bb037fa913b
+refs/heads/master: 21184c4efbba7b7959c7868cf2b99f43f29fc199
diff --git a/trunk/drivers/input/touchscreen/cy8ctmg110_ts.c b/trunk/drivers/input/touchscreen/cy8ctmg110_ts.c
index a93c5c26ab3f..b3fdd1361c36 100644
--- a/trunk/drivers/input/touchscreen/cy8ctmg110_ts.c
+++ b/trunk/drivers/input/touchscreen/cy8ctmg110_ts.c
@@ -84,9 +84,9 @@ static int cy8ctmg110_write_regs(struct cy8ctmg110 *tsc, unsigned char reg,
 	memcpy(i2c_data + 1, value, len);
 
 	ret = i2c_master_send(client, i2c_data, len + 1);
-	if (ret != 1) {
+	if (ret != len + 1) {
 		dev_err(&client->dev, "i2c write data cmd failed\n");
-		return ret ? ret : -EIO;
+		return ret < 0 ? ret : -EIO;
 	}
 
 	return 0;