These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / mouse / elan_i2c_i2c.c

diff --git a/kernel/drivers/input/mouse/elan_i2c_i2c.c b/kernel/drivers/input/mouse/elan_i2c_i2c.c
index a0acbbf..a679e56 100644 (file)
--- a/kernel/drivers/input/mouse/elan_i2c_i2c.c
+++ b/kernel/drivers/input/mouse/elan_i2c_i2c.c
@@ -259,7 +259,8 @@ static int elan_i2c_get_version(struct i2c_client *client,
        return 0;
 }
 
-static int elan_i2c_get_sm_version(struct i2c_client *client, u8 *version)
+static int elan_i2c_get_sm_version(struct i2c_client *client,
+                                  u8 *ic_type, u8 *version)
 {
        int error;
        u8 val[3];
@@ -271,10 +272,11 @@ static int elan_i2c_get_sm_version(struct i2c_client *client, u8 *version)
        }
 
        *version = val[0];
+       *ic_type = val[1];
        return 0;
 }
 
-static int elan_i2c_get_product_id(struct i2c_client *client, u8 *id)
+static int elan_i2c_get_product_id(struct i2c_client *client, u16 *id)
 {
        int error;
        u8 val[3];
@@ -285,7 +287,7 @@ static int elan_i2c_get_product_id(struct i2c_client *client, u8 *id)
                return error;
        }
 
-       *id = val[0];
+       *id = le16_to_cpup((__le16 *)val);
        return 0;
 }