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

Commit 0ce3c83a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
  Input: i8042 - another attempt to fix AUX delivery checks
parents eee8abe5 3ca5de6d

drivers/input/serio/i8042.c

+8 −2
Original line number Diff line number Diff line
@@ -553,7 +553,8 @@ static int __devinit i8042_check_aux(void) 
 */



	param = 0x5a;

	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x5a) {

	retval = i8042_command(&param, I8042_CMD_AUX_LOOP);

	if (retval || param != 0x5a) {



/*

 * External connection test - filters out AT-soldered PS/2 i8042's
@@ -567,6 +568,11 @@ static int __devinit i8042_check_aux(void) 
		    (param && param != 0xfa && param != 0xff))

			return -1;



/*

 * If AUX_LOOP completed without error but returned unexpected data

 * mark it as broken

 */

		if (!retval)

			aux_loop_broken = 1;

	}