summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorShantanu Jain <shjain@codeaurora.org>2013-07-08 19:11:07 +0530
committerAbinaya P <abinayap@codeaurora.org>2016-08-17 16:32:08 +0530
commitfaca745b0bd0c8a569dcede5cc11ab5a5162b6e7 (patch)
tree98f744185c822ae7e7e6e987f7f8af6e3eca738e /drivers/input
parent849d4f3c1c389abc019511467a48594ba82298bc (diff)
input: ft5x06_ts: Handle error if i2c read fails
Handle error if i2c read fails and undo other probe initializations. This patch is propagated from 3.18 kernel 'commit 0123456789ab ("input: ft5x06_ts: Handle error if i2c read fails")' Change-Id: I26180b057b45f4dad123dd3581e5c5f2b33a32aa Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/ft5x06_ts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ft5x06_ts.c b/drivers/input/touchscreen/ft5x06_ts.c
index 53d66b2ac924..3d9361de9836 100644
--- a/drivers/input/touchscreen/ft5x06_ts.c
+++ b/drivers/input/touchscreen/ft5x06_ts.c
@@ -1308,7 +1308,7 @@ static int ft5x06_ts_probe(struct i2c_client *client,
err = ft5x06_i2c_read(client, &reg_addr, 1, &reg_value, 1);
if (err < 0) {
dev_err(&client->dev, "version read failed");
- return err;
+ goto free_reset_gpio;
}
dev_info(&client->dev, "Device ID = 0x%x\n", reg_value);