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

Commit 8b04baba authored by Daniel Martin's avatar Daniel Martin Committed by Dmitry Torokhov
Browse files

Input: synaptics - split synaptics_resolution(), query first 



Split the function synaptics_resolution() into synaptics_resolution() and
synaptics_quirks().  synaptics_resolution() will be called before
synaptics_quirks() to query dimensions and resolutions before overwriting
them with quirks.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarDaniel Martin <consume.noise@gmail.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent bfa76d49

drivers/input/mouse/synaptics.c

+23 −12
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ static int synaptics_resolution(struct psmouse *psmouse) 
{

	struct synaptics_data *priv = psmouse->private;

	unsigned char resp[3];

	int i;



	if (SYN_ID_MAJOR(priv->identity) < 4)

		return 0;
@@ -355,17 +354,6 @@ static int synaptics_resolution(struct psmouse *psmouse) 
		}

	}



	for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {

		if (psmouse_matches_pnp_id(psmouse,

					   min_max_pnpid_table[i].pnp_ids)) {

			priv->x_min = min_max_pnpid_table[i].x_min;

			priv->x_max = min_max_pnpid_table[i].x_max;

			priv->y_min = min_max_pnpid_table[i].y_min;

			priv->y_max = min_max_pnpid_table[i].y_max;

			return 0;

		}

	}



	if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 5 &&

	    SYN_CAP_MAX_DIMENSIONS(priv->ext_cap_0c)) {

		if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MAX_COORDS, resp)) {
@@ -391,6 +379,27 @@ static int synaptics_resolution(struct psmouse *psmouse) 
	return 0;

}



/*

 * Apply quirk(s) if the hardware matches

 */



static void synaptics_apply_quirks(struct psmouse *psmouse)

{

	struct synaptics_data *priv = psmouse->private;

	int i;



	for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {

		if (psmouse_matches_pnp_id(psmouse,

					   min_max_pnpid_table[i].pnp_ids)) {

			priv->x_min = min_max_pnpid_table[i].x_min;

			priv->x_max = min_max_pnpid_table[i].x_max;

			priv->y_min = min_max_pnpid_table[i].y_min;

			priv->y_max = min_max_pnpid_table[i].y_max;

			break;

		}

	}

}



static int synaptics_query_hardware(struct psmouse *psmouse)

{

	if (synaptics_identify(psmouse))
@@ -406,6 +415,8 @@ static int synaptics_query_hardware(struct psmouse *psmouse) 
	if (synaptics_resolution(psmouse))

		return -1;



	synaptics_apply_quirks(psmouse);



	return 0;

}