From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon, 3 Apr 2017 19:01:20 +0000 (-0700)
Subject: Merge tag 'v4.11-rc5' into next
X-Git-Tag: v4.12-rc1~109^2^2~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03b22057e8ed2d1df416c9ae8e6e247e0b87ecc8;p=thirdparty%2Flinux.git

Merge tag 'v4.11-rc5' into next

Sync up with mainline to bring in changes to input subsystem merged
through other trees.
---

03b22057e8ed2d1df416c9ae8e6e247e0b87ecc8
diff --cc drivers/input/mouse/alps.c
index e761955978c61,f210e19ddba66..262d1057c1da2
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@@ -2831,17 -2861,8 +2865,14 @@@ static int alps_identify(struct psmous
  			   ec[2] >= 0x90 && ec[2] <= 0x9d) {
  			protocol = &alps_v3_protocol_data;
  		} else if (e7[0] == 0x73 && e7[1] == 0x03 &&
- 			   e7[2] == 0x14 && ec[1] == 0x02) {
- 			protocol = &alps_v8_protocol_data;
- 		} else if (e7[0] == 0x73 && e7[1] == 0x03 &&
- 			   e7[2] == 0x28 && ec[1] == 0x01) {
+ 			   (e7[2] == 0x14 || e7[2] == 0x28)) {
  			protocol = &alps_v8_protocol_data;
 +		} else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0xc8) {
 +			protocol = &alps_v9_protocol_data;
 +			psmouse_warn(psmouse,
 +				     "Unsupported ALPS V9 touchpad: E7=%3ph, EC=%3ph\n",
 +				     e7, ec);
 +			return -EINVAL;
  		} else {
  			psmouse_dbg(psmouse,
  				    "Likely not an ALPS touchpad: E7=%3ph, EC=%3ph\n", e7, ec);