Commit 225c61aa authored by Florian Ragwitz's avatar Florian Ragwitz Committed by Dmitry Torokhov

Input: elantech - fix firmware version check

The check determining whether device should use 4- or 6-byte packets
was trying to compare firmware with 2.48, but was failing on majors
greater than 2. The new check ensures that versions like 4.1 are
checked properly.
Signed-off-by: default avatarFlorian Ragwitz <rafl@debian.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 51320886
...@@ -665,7 +665,8 @@ int elantech_init(struct psmouse *psmouse) ...@@ -665,7 +665,8 @@ int elantech_init(struct psmouse *psmouse)
* Assume every version greater than this is new EeePC style * Assume every version greater than this is new EeePC style
* hardware with 6 byte packets * hardware with 6 byte packets
*/ */
if (etd->fw_version_maj >= 0x02 && etd->fw_version_min >= 0x30) { if ((etd->fw_version_maj == 0x02 && etd->fw_version_min >= 0x30) ||
etd->fw_version_maj > 0x02) {
etd->hw_version = 2; etd->hw_version = 2;
/* For now show extra debug information */ /* For now show extra debug information */
etd->debug = 1; etd->debug = 1;
......
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