Commit d0ab5478 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: elantech - trust firmware about trackpoint presence

Only try to parse data as coming from trackpoint if firmware told us that
trackpoint is present.

Fixes commit caeb0d37Reported-and-tested-by: default avatarMarcus Overhagen <marcus.overhagen@gmail.com>
Reported-and-tested-by: default avatarAnders Kaseorg <andersk@mit.edu>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent bce4f9e7
......@@ -428,14 +428,6 @@ static void elantech_report_trackpoint(struct psmouse *psmouse,
int x, y;
u32 t;
if (dev_WARN_ONCE(&psmouse->ps2dev.serio->dev,
!tp_dev,
psmouse_fmt("Unexpected trackpoint message\n"))) {
if (etd->debug == 1)
elantech_packet_dump(psmouse);
return;
}
t = get_unaligned_le32(&packet[0]);
switch (t & ~7U) {
......@@ -793,7 +785,7 @@ static int elantech_packet_check_v4(struct psmouse *psmouse)
unsigned char packet_type = packet[3] & 0x03;
bool sanity_check;
if ((packet[3] & 0x0f) == 0x06)
if (etd->tp_dev && (packet[3] & 0x0f) == 0x06)
return PACKET_TRACKPOINT;
/*
......
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