---

yaml --- r: 298971 b: refs/heads/master c: a67ada7 h: refs/heads/master i: 298969: a264daf 298967: 4e63ef3 v: v3
git-mirror · Apr 10, 2012 · 58911ff · 58911ff
1 parent 4d660ad
commit 58911ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d626dad58f02e13730ded6ac84d6a9e53123f0e8
+refs/heads/master: a67ada7a7239b78250c1594b0e02ca68eae848dc
diff --git a/trunk/drivers/input/mouse/elantech.c b/trunk/drivers/input/mouse/elantech.c
@@ -1245,6 +1245,8 @@ static void elantech_disconnect(struct psmouse *psmouse)
  */
 static int elantech_reconnect(struct psmouse *psmouse)
 {
+	psmouse_reset(psmouse);
+
 	if (elantech_detect(psmouse, 0))
 		return -1;
 
@@ -1324,6 +1326,8 @@ int elantech_init(struct psmouse *psmouse)
 	if (!etd)
 		return -ENOMEM;
 
+	psmouse_reset(psmouse);
+
 	etd->parity[0] = 1;
 	for (i = 1; i < 256; i++)
 		etd->parity[i] = etd->parity[i & (i - 1)] ^ 1;