When performing a warm reboot from a system which does not correctly
support ELAN I2C touchpads, the touchpad will sometimes enter standard
mouse mode, cursor then never respond to touchpad event, and making the
driver discard the HID reports and flood dmesg with following error
messages.
"elan_i2c i2c-ELAN1000:00: invalid report id data (1)"
This change is from ELAN's correction. It needs 200ms delay before
set_mode() so that the mode setting will correctly take effect.
Signed-off-by: Chris Chiu <chiu@xxxxxxxxxxxx>
---
drivers/input/mouse/elan_i2c_core.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 2f58985..95080f9 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -210,18 +210,20 @@ static int __elan_initialize(struct elan_tp_data *data)
return error;
}
- data->mode |= ETP_ENABLE_ABS;
- error = data->ops->set_mode(client, data->mode);
+ error = data->ops->sleep_control(client, false);
if (error) {
dev_err(&client->dev,
- "failed to switch to absolute mode: %d\n", error);
+ "failed to wake device up: %d\n", error);
return error;
}
- error = data->ops->sleep_control(client, false);
+ msleep(200);
+
+ data->mode |= ETP_ENABLE_ABS;
+ error = data->ops->set_mode(client, data->mode);
if (error) {
dev_err(&client->dev,
- "failed to wake device up: %d\n", error);
+ "failed to switch to absolute mode: %d\n", error);
return error;
}
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
