summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-15 07:32:53 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-15 07:32:53 -0700
commit08725d177587d4dcb1e54615c19021d45ee88ec8 (patch)
tree146ea377278f7b105fa64e8de26f45f866b2aa75
parent0912959250bbf604dd9edabb35c4b24dcb939b86 (diff)
parent4e02797d45d304818f0f5b0b4e5b72f2d5d08a19 (diff)
Merge "input: touchscreen: Correct return value check in Goodix driver"
-rw-r--r--drivers/input/touchscreen/gt9xx/gt9xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/gt9xx/gt9xx.c b/drivers/input/touchscreen/gt9xx/gt9xx.c
index 76250b87204d..4d71d474c113 100644
--- a/drivers/input/touchscreen/gt9xx/gt9xx.c
+++ b/drivers/input/touchscreen/gt9xx/gt9xx.c
@@ -1057,7 +1057,7 @@ static int gtp_check_product_id(struct i2c_client *client)
ret = gtp_i2c_read(client, buf, sizeof(buf));
if (ret < 0) {
- dev_err(&client->dev, "GTP read version failed.\n");
+ dev_err(&client->dev, "GTP read product_id failed.\n");
return -EIO;
}
@@ -1740,7 +1740,7 @@ static int goodix_ts_probe(struct i2c_client *client,
dev_info(&client->dev, "GTP works in interrupt mode.\n");
ret = gtp_read_fw_version(client, &version_info);
- if (ret != 0)
+ if (ret != 2)
dev_err(&client->dev, "GTP firmware version read failed.\n");
ret = gtp_check_product_id(client);