This reverts commit ec667683c532c93fb41e100e5d61a518971060e2, which breaks the Trackpoint on ThinkPad X1 Carbon Gen5 (Model 20HR). That commit intended to add support for later firmware versions to the trackpoint driver, however, the version is reported in the second byte whereas the change was made to the magic byte preceding that version. The update package linked by Lenovo suggests that 20HR models use an ALPS Touchpad instead. Signed-off-by: Sebastian Schmidt <yath@xxxxxxx> Acked-by: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx --- drivers/input/mouse/trackpoint.c | 3 +-- drivers/input/mouse/trackpoint.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index 0871010f18d5..20b5b21c1bba 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c @@ -265,8 +265,7 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *fir if (ps2_command(&psmouse->ps2dev, param, MAKE_PS2_CMD(0, 2, TP_READ_ID))) return -1; - /* add new TP ID. */ - if (!(param[0] & TP_MAGIC_IDENT)) + if (param[0] != TP_MAGIC_IDENT) return -1; if (firmware_id) diff --git a/drivers/input/mouse/trackpoint.h b/drivers/input/mouse/trackpoint.h index 88055755f82e..5617ed3a7d7a 100644 --- a/drivers/input/mouse/trackpoint.h +++ b/drivers/input/mouse/trackpoint.h @@ -21,9 +21,8 @@ #define TP_COMMAND 0xE2 /* Commands start with this */ #define TP_READ_ID 0xE1 /* Sent for device identification */ -#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */ +#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */ /* by the firmware ID */ - /* Firmware ID includes 0x1, 0x2, 0x3 */ /* -- 2.15.1 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
