summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorFrodo Lai <frodo.lai@gmail.com>2015-06-16 15:03:53 -0700
committerSasha Levin <sasha.levin@oracle.com>2015-07-03 23:02:32 -0400
commita85076d1b29f9159979648d1973651a245d49a5e (patch)
treede835724467b4010f032fd1f8e7feae468a777ef /drivers
parent1cce6f3b54f698daa097222ed783ad6acda417be (diff)
Input: pixcir_i2c_ts - fix receive error
[ Upstream commit 469d7d22cea146e40efe8c330e5164b4d8f13934 ] The i2c_master_recv() uses readsize to receive data from i2c but compares to size of rdbuf which is always 27. This would cause problem when the max_fingers is not 5. Change the comparison value to readsize instead. Fixes: 36874c7e219 ("Input: pixcir_i2c_ts - support up to 5 fingers and hardware tracking IDs:) Cc: stable@vger.kernel.org Signed-off-by: Frodo Lai <frodo_lai@bcmcom.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/touchscreen/pixcir_i2c_ts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index fc49c75317d1..9788a9b4a610 100644
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -78,7 +78,7 @@ static void pixcir_ts_parse(struct pixcir_i2c_ts_data *tsdata,
}
ret = i2c_master_recv(tsdata->client, rdbuf, readsize);
- if (ret != sizeof(rdbuf)) {
+ if (ret != readsize) {
dev_err(&tsdata->client->dev,
"%s: i2c_master_recv failed(), ret=%d\n",
__func__, ret);