---
psmouse-base.c | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/psmouse-base.c b/psmouse-base.c
index b407b35..3b8e63c 100644
--- a/psmouse-base.c
+++ b/psmouse-base.c
@@ -856,12 +856,12 @@ static const struct psmouse_protocol *psmouse_protocol_by_name(const char *name,
return NULL;
}

-
/*
- * psmouse_probe() probes for a PS/2 mouse.
+ * __psmouse_probe() probes for a PS/2 mouse.
+ * Wrapped by psmouse_probe() for clean reset code.
*/

-static int psmouse_probe(struct psmouse *psmouse)
+static int __psmouse_probe(struct psmouse *psmouse)
{
struct ps2dev *ps2dev = &psmouse->ps2dev;
unsigned char param[2];
@@ -892,6 +892,28 @@ static int psmouse_probe(struct psmouse *psmouse)
}

/*
+ * Wrapper for probe routine to cleanly reset the device should
+ * the initial probe fail for any reason.
+ */
+static int psmouse_probe(struct psmouse *psmouse) {
+ struct ps2dev *ps2dev = &psmouse->ps2dev;
+ int tries = 3;
+ int ret = -1;
+
+retry:
+ if (tries > 0 && ((ret = __psmouse_probe(psmouse)) != 0)) {
+ printk(KERN_ERR "psmouse.c: Error encountered while probing PS/2 device on %s "
+ "reseting...
", ps2dev->serio->phys);
+ psmouse_reset(psmouse);
+ msleep(500);
+ tries--;
+ goto retry;
+ }
+
+ return ret;
+}
+
+/*
* Here we set the mouse resolution.
*/

--
1.6.3.3


--------------000703040809060808000409
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

--------------000703040809060808000409--