From 58911ff6dce71000761caac3584b788b8a58bb7c Mon Sep 17 00:00:00 2001
From: JJ Ding <jj_ding@emc.com.tw>
Date: Tue, 10 Apr 2012 00:29:12 -0700
Subject: [PATCH] --- yaml --- r: 298971 b: refs/heads/master c:
 a67ada7a7239b78250c1594b0e02ca68eae848dc h: refs/heads/master i:   298969:
 a264daf1090487f7d2c1b7b927f07652f2077dda   298967:
 4e63ef31e7554a0a0776c25ec5d4714754bb496a v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/input/mouse/elantech.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f4f209196b0e..aea472aa968c 100644
--- 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
index d2c0db159b18..21c68a8953d7 100644
--- 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;