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

Commit 4b1af853 authored by Pali Rohár's avatar Pali Rohár Committed by Dmitry Torokhov
Browse files

Input: ALPS - report v3 pinnacle trackstick device only if is present 



This patch moves v3 pinnacle code for trackstick detection from
alps_hw_init_v3() to alps_set_protocol() so ALPS_DUALPOINT flag can be
cleared before registering trackstick input device in kernel.

Signed-off-by: default avatarPali Rohár <pali.rohar@gmail.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent dae928ec

drivers/input/mouse/alps.c

+7 −5
Original line number Diff line number Diff line
@@ -2129,15 +2129,12 @@ static int alps_setup_trackstick_v3(struct psmouse *psmouse, int reg_base) 


static int alps_hw_init_v3(struct psmouse *psmouse)

{

	struct alps_data *priv = psmouse->private;

	struct ps2dev *ps2dev = &psmouse->ps2dev;

	int reg_val;

	unsigned char param[4];



	reg_val = alps_probe_trackstick_v3_v7(psmouse, ALPS_REG_BASE_PINNACLE);

	if (reg_val == -EIO)

		goto error;



	if (reg_val == 0 &&

	if ((priv->flags & ALPS_DUALPOINT) &&

	    alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)

		goto error;
@@ -2614,6 +2611,11 @@ static int alps_set_protocol(struct psmouse *psmouse, 
		priv->decode_fields = alps_decode_pinnacle;

		priv->nibble_commands = alps_v3_nibble_commands;

		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;



		if (alps_probe_trackstick_v3_v7(psmouse,

						ALPS_REG_BASE_PINNACLE) < 0)

			priv->flags &= ~ALPS_DUALPOINT;



		break;



	case ALPS_PROTO_V3_RUSHMORE: