Skip to content

Commit

Permalink
Input: elantech - use elantech_report_trackpoint for hardware v4 too
Browse files Browse the repository at this point in the history
The Fujitsu H730 has hardware v4 with a trackpoint. This enables the
elantech_report_trackpoint for v4.

Reported-by: Stefan Valouch <stefan@valouch.com>
Tested-by: Stefan Valouch <stefan@valouch.com>
Tested-by: Alfredo Gemma <alfredo.gemma@gmail.com>
Signed-off-by: Ulrik De Bie <ulrik.debie-os@e2big.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
ulrikdb authored and dtor committed Nov 8, 2014
1 parent c42bfd7 commit caeb0d3
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions drivers/input/mouse/elantech.c
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,9 @@ static int elantech_packet_check_v4(struct psmouse *psmouse)
unsigned char packet_type = packet[3] & 0x03;
bool sanity_check;

if ((packet[3] & 0x0f) == 0x06)
return PACKET_TRACKPOINT;

/*
* Sanity check based on the constant bits of a packet.
* The constant bits change depending on the value of
Expand Down Expand Up @@ -877,10 +880,19 @@ static psmouse_ret_t elantech_process_byte(struct psmouse *psmouse)

case 4:
packet_type = elantech_packet_check_v4(psmouse);
if (packet_type == PACKET_UNKNOWN)
switch (packet_type) {
case PACKET_UNKNOWN:
return PSMOUSE_BAD_DATA;

elantech_report_absolute_v4(psmouse, packet_type);
case PACKET_TRACKPOINT:
elantech_report_trackpoint(psmouse, packet_type);
break;

default:
elantech_report_absolute_v4(psmouse, packet_type);
break;
}

break;
}

Expand Down

0 comments on commit caeb0d3

Please sign in to comment.