From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Date: Mon, 9 Mar 2015 05:33:36 +0000 (-0700)
Subject: Input: synaptics - do not retrieve the board id on old firmwares
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b57a7128be24062b5b5b26032b7cd58f1651547e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 2f42a712f3e0..2176874a41b1 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -250,6 +250,10 @@ static int synaptics_board_id(struct psmouse *psmouse)
 	struct synaptics_data *priv = psmouse->private;
 	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))
 		return -1;
 	priv->board_id = ((bid[0] & 0xfc) << 6) | bid[1];