Re: [git pull] Input updates for 3.18-rc4

[Dmitry Torokhov <dmitry.torokhov@gmail.com>]

On Wed, Nov 19, 2014 at 07:20:21PM +0100, Marcus Overhagen wrote:
> Hi,
> 
> I will try reverting that, but may need until tomorrow or Friday.
> 
> Just now I made a warm reboot from rc3 to rc5 and initially scrolling
> behaviour was ok,  but after about a minute it went wrong and I got
> this:
> 
> [  179.705362] ------------[ cut here ]------------
> [  179.705382] WARNING: CPU: 3 PID: 0 at
> drivers/input/mouse/elantech.c:433
> elantech_report_trackpoint.isra.5+0x199/0x1b0 [psmouse]()
> [  179.705385] psmouse serio1: elantech: Unexpected trackpoint message

Or just this for now:

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 3fcb6b3..294f613 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -793,7 +793,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 ((packet[3] & 0x0f) == 0x06 && etd->tp_dev)
 		return PACKET_TRACKPOINT;
 
 	/*

-- 
Dmitry