Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752555AbdCECNU (ORCPT ); Sat, 4 Mar 2017 21:13:20 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35557 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752296AbdCECNS (ORCPT ); Sat, 4 Mar 2017 21:13:18 -0500 From: Matjaz Hegedic To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Matjaz Hegedic Subject: [PATCH] Input: elan_i2c - add ASUS EeeBook X205TA special touchpad fw Date: Sun, 5 Mar 2017 03:13:02 +0100 Message-Id: <1488679982-9825-1-git-send-email-matjaz.hegedic@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1306 Lines: 46 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 --- drivers/input/mouse/elan_i2c_core.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 2c7d287..dde3ad7 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -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: - return true; - default: - return false; + if (data->ic_type == 0x0E) { + switch (data->product_id) { + case 0x05 ... 0x07: + case 0x09: + case 0x13: + return true; + } } + /* ASUS EeeBook X205TA */ + else if (data->ic_type == 0x8 && data->product_id == 0x26) + return true; + + return false; } static int __elan_initialize(struct elan_tp_data *data) -- 2.7.4