p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Input: synaptics - do not retrieve the board id on old firmwares 

The board id capability has been added in firmware 7.5.

Cc: stable@vger.kernel.org
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Benjamin Tissoires 2015-03-08 22:33:36 -07:00 committed by Dmitry Torokhov
parent ebc80840b8
commit b57a7128be
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/mouse/synaptics.c
View File

@ -250,6 +250,10 @@ static int synaptics_board_id(struct psmouse *psmouse)
struct synaptics_data *priv = psmouse->private; struct synaptics_data *priv = psmouse->private;
unsigned char bid[3]; unsigned char bid[3];
/* firmwares prior 7.5 have no board_id encoded */
if (SYN_ID_FULL(priv->identity) < 0x705)
return 0;
if (synaptics_send_cmd(psmouse, SYN_QUE_MODES, bid)) if (synaptics_send_cmd(psmouse, SYN_QUE_MODES, bid))
return -1; return -1;
priv->board_id = ((bid[0] & 0xfc) << 6) | bid[1]; priv->board_id = ((bid[0] & 0xfc) << 6) | bid[1];