Skip to content

Commit

Permalink
Input: elan_i2c - add ASUS EeeBook X205TA special touchpad fw
Browse files Browse the repository at this point in the history
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: Matjaz Hegedic <matjaz.hegedic@gmail.com>
Acked-by: KT Liao <kt.liao@emc.com.tw>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Matjaz Hegedic authored and Dmitry Torokhov committed Mar 10, 2017
1 parent a4c2a13 commit 92ef6f9
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions drivers/input/mouse/elan_i2c_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
if (data->ic_type != 0x0E)
return false;

switch (data->product_id) {
case 0x05 ... 0x07:
case 0x09:
case 0x13:
if (data->ic_type == 0x0E) {
switch (data->product_id) {
case 0x05 ... 0x07:
case 0x09:
case 0x13:
return true;
}
} else if (data->ic_type == 0x08 && data->product_id == 0x26) {
/* ASUS EeeBook X205TA */
return true;
default:
return false;
}

return false;
}

static int __elan_initialize(struct elan_tp_data *data)
Expand Down

0 comments on commit 92ef6f9

Please sign in to comment.