Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xpad - add USB-ID for PL-3601 Xbox 360 pad
  Input: cy8ctmg100_ts - signedness bug
  Input: elantech - report position also with 3 fingers
  Input: elantech - discard the first 2 positions on some firmwares
  Input: adxl34x - do not mark device as disabled on startup
  Input: gpio_keys - add hooks to enable/disable device
  Input: evdev - rearrange ioctl handling
  Input: dynamically allocate ABS information
  Input: switch to input_abs_*() access functions
  Input: add static inline accessors for ABS properties

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,
                 unsigned char len, unsigned char *value)
 {
         struct i2c_client *client = tsc->client;
-        unsigned int ret;
+        int ret;
         unsigned char i2c_data[6];
 
         BUG_ON(len > 5);
@@ -86,7 +86,7 @@ static int cy8ctmg110_write_regs(struct cy8ctmg110 *tsc, unsigned char reg,
         ret = i2c_master_send(client, i2c_data, len + 1);
         if (ret != 1) {
                 dev_err(&client->dev, "i2c write data cmd failed\n");
-                return ret;
+                return ret ? ret : -EIO;
         }
 
         return 0;
@@ -96,7 +96,7 @@ static int cy8ctmg110_read_regs(struct cy8ctmg110 *tsc,
                 unsigned char *data, unsigned char len, unsigned char cmd)
 {
         struct i2c_client *client = tsc->client;
-        unsigned int ret;
+        int ret;
         struct i2c_msg msg[2] = {
                 /* first write slave position to i2c devices */
                 { client->addr, 0, 1, &cmd },