Commit 40d8aa97 authored by Jingle Wu's avatar Jingle Wu Committed by Dmitry Torokhov

Input: elan_i2c - handle devices with patterns above 1

Extend fetching and parsing parameters of the controllers to devices with
"patterns" above 1 (which currently should be handled in the same fashion
as devices with pattern 1).
Signed-off-by: default avatarJingle Wu <jingle.wu@emc.com.tw>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent fc7c882a
...@@ -284,7 +284,7 @@ static int elan_i2c_get_version(struct i2c_client *client, ...@@ -284,7 +284,7 @@ static int elan_i2c_get_version(struct i2c_client *client,
return error; return error;
} }
if (pattern_ver == 0x01) if (pattern_ver >= 0x01)
*version = iap ? val[1] : val[0]; *version = iap ? val[1] : val[0];
else else
*version = val[0]; *version = val[0];
...@@ -305,7 +305,7 @@ static int elan_i2c_get_sm_version(struct i2c_client *client, ...@@ -305,7 +305,7 @@ static int elan_i2c_get_sm_version(struct i2c_client *client,
return error; return error;
} }
if (pattern_ver == 0x01) { if (pattern_ver >= 0x01) {
error = elan_i2c_read_cmd(client, ETP_I2C_IC_TYPE_CMD, val); error = elan_i2c_read_cmd(client, ETP_I2C_IC_TYPE_CMD, val);
if (error) { if (error) {
dev_err(&client->dev, "failed to get ic type: %d\n", dev_err(&client->dev, "failed to get ic type: %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment