Commit bbf8fc61 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://

* 'for-linus' of git://
  Input: psmouse - make sure we don't schedule reconnects after cleanup
parents 67dcabd0 a9f0c381
...@@ -1141,7 +1141,14 @@ static void psmouse_cleanup(struct serio *serio) ...@@ -1141,7 +1141,14 @@ static void psmouse_cleanup(struct serio *serio)
psmouse_deactivate(parent); psmouse_deactivate(parent);
} }
psmouse_deactivate(psmouse); psmouse_set_state(psmouse, PSMOUSE_INITIALIZING);
* Disable stream mode so cleanup routine can proceed undisturbed.
if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_DISABLE))
printk(KERN_WARNING "psmouse.c: Failed to disable mouse on %s\n",
if (psmouse->cleanup) if (psmouse->cleanup)
psmouse->cleanup(psmouse); psmouse->cleanup(psmouse);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment