diff options
Diffstat (limited to 'drivers/input/touchscreen/cy8ctmg110_ts.c')
-rw-r--r-- | drivers/input/touchscreen/cy8ctmg110_ts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c index 4eb7df0b7f87..5ec0946938fe 100644 --- a/drivers/input/touchscreen/cy8ctmg110_ts.c +++ b/drivers/input/touchscreen/cy8ctmg110_ts.c | |||
@@ -75,7 +75,7 @@ static int cy8ctmg110_write_regs(struct cy8ctmg110 *tsc, unsigned char reg, | |||
75 | unsigned char len, unsigned char *value) | 75 | unsigned char len, unsigned char *value) |
76 | { | 76 | { |
77 | struct i2c_client *client = tsc->client; | 77 | struct i2c_client *client = tsc->client; |
78 | unsigned int ret; | 78 | int ret; |
79 | unsigned char i2c_data[6]; | 79 | unsigned char i2c_data[6]; |
80 | 80 | ||
81 | BUG_ON(len > 5); | 81 | BUG_ON(len > 5); |
@@ -86,7 +86,7 @@ static int cy8ctmg110_write_regs(struct cy8ctmg110 *tsc, unsigned char reg, | |||
86 | ret = i2c_master_send(client, i2c_data, len + 1); | 86 | ret = i2c_master_send(client, i2c_data, len + 1); |
87 | if (ret != 1) { | 87 | if (ret != 1) { |
88 | dev_err(&client->dev, "i2c write data cmd failed\n"); | 88 | dev_err(&client->dev, "i2c write data cmd failed\n"); |
89 | return ret; | 89 | return ret ? ret : -EIO; |
90 | } | 90 | } |
91 | 91 | ||
92 | return 0; | 92 | return 0; |
@@ -96,7 +96,7 @@ static int cy8ctmg110_read_regs(struct cy8ctmg110 *tsc, | |||
96 | unsigned char *data, unsigned char len, unsigned char cmd) | 96 | unsigned char *data, unsigned char len, unsigned char cmd) |
97 | { | 97 | { |
98 | struct i2c_client *client = tsc->client; | 98 | struct i2c_client *client = tsc->client; |
99 | unsigned int ret; | 99 | int ret; |
100 | struct i2c_msg msg[2] = { | 100 | struct i2c_msg msg[2] = { |
101 | /* first write slave position to i2c devices */ | 101 | /* first write slave position to i2c devices */ |
102 | { client->addr, 0, 1, &cmd }, | 102 | { client->addr, 0, 1, &cmd }, |