Commit 03def640 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Luis Henriques

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

commit b57a7128 upstream.

The board id capability has been added in firmware 7.5.
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 6364f9a0
...@@ -248,6 +248,10 @@ static int synaptics_board_id(struct psmouse *psmouse) ...@@ -248,6 +248,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];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment