Reset ps/2 port should psmouse_probe fail before retrying

Commit Message

Christoph Fritz May 8, 2010, 4:01 p.m. UTC

None

Patch

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 026df60..6750dbb 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -138,7 +138,9 @@  static int synaptics_capability(struct psmouse *psmouse)
 		return -1;
 	priv->capabilities = (cap[0] << 16) | (cap[1] << 8) | cap[2];
 	priv->ext_cap = 0;
-	if (!SYN_CAP_VALID(priv->capabilities))
+	if (!SYN_CAP_VALID(priv->capabilities) &&
+		SYN_ID_MAJOR(priv->identity) < 7 &&
+		SYN_ID_MINOR(priv->identity) < 5)
 		return -1;
 
 	/*