Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbf8fc61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - make sure we don't schedule reconnects after cleanup
parents 67dcabd0 a9f0c381

drivers/input/mouse/psmouse-base.c

+8 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,14 @@ static void psmouse_cleanup(struct serio *serio) 
		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",

			psmouse->ps2dev.serio->phys);



	if (psmouse->cleanup)

		psmouse->cleanup(psmouse);