--- drivers/input/mouse/psmouse-base.c

+++ drivers/input/mouse/psmouse-base.c

@@ -1349,6 +1349,7 @@ static int psmouse_reconnect(struct seri

struct psmouse *psmouse = serio_get_drvdata(serio);

struct psmouse *parent = NULL;

struct serio_driver *drv = serio->drv;

+ unsigned char type;

int rc = -1;

if (!drv || !psmouse) {

@@ -1368,10 +1369,15 @@ static int psmouse_reconnect(struct seri

if (psmouse->reconnect) {

if (psmouse->reconnect(psmouse))

goto out;

- } else if (psmouse_probe(psmouse) < 0 ||

- psmouse->type != psmouse_extensions(psmouse,

- psmouse_max_proto, false)) {

- goto out;

+ } else {

+ psmouse_reset(psmouse);

+

+ if (psmouse_probe(psmouse) < 0)

+ goto out;

+

+ type = psmouse_extensions(psmouse, psmouse_max_proto, false);

+ if (psmouse->type != type)

+ goto out;

}

/* ok, the device type (and capabilities) match the old one,