| Message ID | E043392A-A8F9-40C7-A273-3B20AA3F00D8@emc.com.tw (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Sep 02, 2015 at 09:03:46AM +0800, duson wrote: > 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. > > Signed-off-by: Duson Lin <dusonlin@emc.com.tw> > --- > drivers/input/mouse/elan_i2c_core.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c > index 5b5f403..d99d40c 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) <dusonlin@emc.com.tw> > - * 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,11 +261,11 @@ 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); > if (error) { > dev_err(&data->client->dev, > - "unknown ic type %d\n", data->ic_type); > + "unknown ic type %d\n", data->iap_version); Applied but changed the working here to "unknown iap version" and also changed argument name in elan_get_fwinfo. Thanks.
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 5b5f403..d99d40c 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) <dusonlin@emc.com.tw> - * 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,11 +261,11 @@ 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); if (error) { dev_err(&data->client->dev, - "unknown ic type %d\n", data->ic_type); + "unknown ic type %d\n", data->iap_version); return error; }
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. Signed-off-by: Duson Lin <dusonlin@emc.com.tw> --- drivers/input/mouse/elan_i2c_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html