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

Commit c0cd17f6 authored by Hans de Goede's avatar Hans de Goede Committed by Dmitry Torokhov
Browse files

Input: alps - cache firmware version 



Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 38c11eaa

drivers/input/mouse/alps.c

+3 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,9 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv) 
	    alps_exit_command_mode(psmouse))

		return -EIO;



	/* Save the Firmware version */

	memcpy(priv->fw_ver, ec, 3);



	if (alps_match_table(psmouse, priv, e7, ec) == 0) {

		return 0;

	} else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 &&

drivers/input/mouse/alps.h

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ struct alps_fields { 
 *   known format for this model.  The first byte of the report, ANDed with

 *   mask0, should match byte0.

 * @mask0: The mask used to check the first byte of the report.

 * @fw_ver: cached copy of firmware version (EC report)

 * @flags: Additional device capabilities (passthrough port, trackstick, etc.).

 * @x_max: Largest possible X position value.

 * @y_max: Largest possible Y position value.
@@ -149,6 +150,7 @@ struct alps_data { 
	int addr_command;

	unsigned char proto_version;

	unsigned char byte0, mask0;

	unsigned char fw_ver[3];

	int flags;

	int x_max;

	int y_max;