Input: elan_i2c - Use iap_version to get firmware information

Commit Message

Duson Lin Sept. 2, 2015, 12:55 a.m. UTC

Hi Dmitry,

Please ignore this patch, I will send a right again. Thank you.

Duson

-----Original Message-----
From: duson [mailto:[e-mail]] 
Sent: Wednesday, September 02, 2015 8:38 AM
To: Dmitry Torokhov
Cc: [e-mail]; [e-mail]; 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, instead of
ic_type we use iap_version to get firmware information.
---
 drivers/input/mouse/elan_i2c_core.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

 	if (error) {
 		dev_err(&data->client->dev,


--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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: ??? (Duson Lin) <[e-mail]>
- * 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"
 
 #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_data
*data)
 	if (error)
 		return error;
 
-	error = elan_get_fwinfo(data->ic_type, &data->fw_vaildpage_count,
+	error = elan_get_fwinfo(data->iap_version,
&data->fw_vaildpage_count,
 				&data->fw_signature_address);