On Fri, Feb 10, 2017 at 11:02:21AM +0800, Aaron Ma wrote: > Synaptics add new TP firmware ID: 0x2 and 0x3, for now both lower 2 bits > are indicated as TP. Change the constant to bitwise values. Hmm, I thought IBM/Lenovo owned trackpoint support... Andrew, is it yours now? Aaron, what devices have these new trackpoints>? Thanks. > > Signed-off-by: Aaron Ma <aaron.ma@xxxxxxxxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx > --- > drivers/input/mouse/trackpoint.c | 3 ++- > drivers/input/mouse/trackpoint.h | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c > index 7331084..9ff0f38 100644 > --- a/drivers/input/mouse/trackpoint.c > +++ b/drivers/input/mouse/trackpoint.c > @@ -265,7 +265,8 @@ 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; > > - if (param[0] != TP_MAGIC_IDENT) > + /* add new TP ID. */ > + 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 5617ed3..8805575 100644 > --- a/drivers/input/mouse/trackpoint.h > +++ b/drivers/input/mouse/trackpoint.h > @@ -21,8 +21,9 @@ > #define TP_COMMAND 0xE2 /* Commands start with this */ > > #define TP_READ_ID 0xE1 /* Sent for device identification */ > -#define TP_MAGIC_IDENT 0x01 /* Sent after a TP_READ_ID followed */ > +#define TP_MAGIC_IDENT 0x03 /* Sent after a TP_READ_ID followed */ > /* by the firmware ID */ > + /* Firmware ID includes 0x1, 0x2, 0x3 */ > > > /* > -- > 2.9.3 > -- Dmitry -- 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
