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

Commit 4a18b3ab authored by Tai-hwa Liang's avatar Tai-hwa Liang Committed by Dmitry Torokhov
Browse files

Input: pmouse - move Sentelic probe down the list 

Sentelic probes confuse IBM trackpoints so they stop responding to
TP_READ_ID command. See:

	http://bugzilla.kernel.org/show_bug.cgi?id=14970



Let's move FSP detection lower so it is probed after trackpoint and
others, just before we strat probing for Intellimouse Explorer.

Signed-off-by: default avatarTai-hwa Liang <avatar@sentelic.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 15e184af

drivers/input/mouse/psmouse-base.c

+15 −13
Original line number Diff line number Diff line
@@ -690,19 +690,6 @@ static int psmouse_extensions(struct psmouse *psmouse, 
		max_proto = PSMOUSE_IMEX;

	}



/*

 * Try Finger Sensing Pad

 */

	if (max_proto > PSMOUSE_IMEX) {

		if (fsp_detect(psmouse, set_properties) == 0) {

			if (!set_properties || fsp_init(psmouse) == 0)

				return PSMOUSE_FSP;

/*

 * Init failed, try basic relative protocols

 */

			max_proto = PSMOUSE_IMEX;

		}

	}



	if (max_proto > PSMOUSE_IMEX) {

		if (genius_detect(psmouse, set_properties) == 0)
@@ -718,6 +705,21 @@ static int psmouse_extensions(struct psmouse *psmouse, 
			return PSMOUSE_TOUCHKIT_PS2;

	}



/*

 * Try Finger Sensing Pad. We do it here because its probe upsets

 * Trackpoint devices (causing TP_READ_ID command to time out).

 */

	if (max_proto > PSMOUSE_IMEX) {

		if (fsp_detect(psmouse, set_properties) == 0) {

			if (!set_properties || fsp_init(psmouse) == 0)

				return PSMOUSE_FSP;

/*

 * Init failed, try basic relative protocols

 */

			max_proto = PSMOUSE_IMEX;

		}

	}



/*

 * Reset to defaults in case the device got confused by extended

 * protocol probes. Note that we follow up with full reset because