Commit 3c9da7cf authored by Matjaz Hegedic's avatar Matjaz Hegedic Committed by Greg Kroah-Hartman

Input: elan_i2c - add ASUS EeeBook X205TA special touchpad fw

commit 92ef6f97 upstream.

EeeBook X205TA is yet another ASUS device with a special touchpad
firmware that needs to be accounted for during initialization, or
else the touchpad will go into an invalid state upon suspend/resume.
Adding the appropriate ic_type and product_id check fixes the problem.
Signed-off-by: default avatarMatjaz Hegedic <matjaz.hegedic@gmail.com>
Acked-by: default avatarKT Liao <kt.liao@emc.com.tw>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4ccef6bd
...@@ -218,17 +218,19 @@ static int elan_query_product(struct elan_tp_data *data) ...@@ -218,17 +218,19 @@ static int elan_query_product(struct elan_tp_data *data)
static int elan_check_ASUS_special_fw(struct elan_tp_data *data) static int elan_check_ASUS_special_fw(struct elan_tp_data *data)
{ {
if (data->ic_type != 0x0E) if (data->ic_type == 0x0E) {
return false; switch (data->product_id) {
case 0x05 ... 0x07:
switch (data->product_id) { case 0x09:
case 0x05 ... 0x07: case 0x13:
case 0x09: return true;
case 0x13: }
} else if (data->ic_type == 0x08 && data->product_id == 0x26) {
/* ASUS EeeBook X205TA */
return true; return true;
default:
return false;
} }
return false;
} }
static int __elan_initialize(struct elan_tp_data *data) static int __elan_initialize(struct elan_tp_data *data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment