projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
mouse
/
elan_i2c_smbus.c
diff --git
a/drivers/input/mouse/elan_i2c_smbus.c
b/drivers/input/mouse/elan_i2c_smbus.c
index ff36a366b2aa1aadbe3c9a7f0e9de3eb687d83c3..cb6aecbc1dc28a20885885c4b361ecf8343bc445 100644
(file)
--- a/
drivers/input/mouse/elan_i2c_smbus.c
+++ b/
drivers/input/mouse/elan_i2c_smbus.c
@@
-183,7
+183,7
@@
static int elan_smbus_get_sm_version(struct i2c_client *client,
return 0;
}
return 0;
}
-static int elan_smbus_get_product_id(struct i2c_client *client, u
8
*id)
+static int elan_smbus_get_product_id(struct i2c_client *client, u
16
*id)
{
int error;
u8 val[3];
{
int error;
u8 val[3];
@@
-195,7
+195,7
@@
static int elan_smbus_get_product_id(struct i2c_client *client, u8 *id)
return error;
}
return error;
}
- *id =
val[1]
;
+ *id =
be16_to_cpup((__be16 *)val)
;
return 0;
}
return 0;
}