From mboxrd@z Thu Jan 1 00:00:00 1970 From: "DusonLin" Subject: RE: [PATCH] Input: elan_i2c - Use iap_version to get firmware information Date: Wed, 2 Sep 2015 08:55:43 +0800 Message-ID: <002401d0e51a$187a4100$496ec300$@emc.com.tw> References: Mime-Version: 1.0 Content-Type: text/plain; charset=big5 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Content-Language: zh-tw Sender: linux-kernel-owner@vger.kernel.org To: 'Dmitry Torokhov' Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-input@vger.kernel.org Hi Dmitry, Please ignore this patch, I will send a right again. Thank you. Duson -----Original Message----- =46rom: duson [mailto:dusonlin@emc.com.tw]=20 Sent: Wednesday, September 02, 2015 8:45 AM To: Dmitry Torokhov Cc: linux-input@vger.kernel.org; linux-kernel@vger.kernel.org; dusonlin= @emc. com.tw Subject: [PATCH] Input: elan_i2c - Use iap_version to get firmware information When driver get exception ic type (0xFF), maybe occurred from wrong I2C protocol communication, system crash or other unknown situation, instea= d of ic_type we use iap_version to get firmware information. Signed-off-by: Duson Lin --- drivers/input/mouse/elan_i2c_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 5b5f403..494858c 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -4,7 +4,7 @@ * Copyright (c) 2013 ELAN Microelectronics Corp. * * Author: =AAL=ACF=BA=FB (Duson Lin) - * Version: 1.5.9 + * Version: 1.6.0 * * Based on cyapa driver: * copyright (c) 2011-2012 Cypress Semiconductor, Inc. @@ -40,7 +40,7 @@ #include "elan_i2c.h" =20 #define DRIVER_NAME "elan_i2c" -#define ELAN_DRIVER_VERSION "1.5.9" +#define ELAN_DRIVER_VERSION "1.6.0" #define ETP_MAX_PRESSURE 255 #define ETP_FWIDTH_REDUCE 90 #define ETP_FINGER_WIDTH 15 @@ -261,7 +261,7 @@ static int elan_query_device_info(struct elan_tp_da= ta *data) if (error) return error; =20 - error =3D elan_get_fwinfo(data->ic_type, &data->fw_vaildpage_count, + error =3D elan_get_fwinfo(data->iap_version, &data->fw_vaildpage_count, &data->fw_signature_address); if (error) { dev_err(&data->client->dev,