diff options
| author |   Hans de Goede <hdegoede@redhat.com> | 2014-07-25 22:49:14 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-26 14:03:19 -0700 |
| commit | c0cd17f6dc7342a81b61017e6b84e363f86081c6 (patch) | |
| tree | ef23faa1be9c0d0835b784ecb52ffbd7b39da43d /drivers | |
| parent | Input: alps - change decode function prototype to return an int (diff) | |
| download | linux-dev-c0cd17f6dc7342a81b61017e6b84e363f86081c6.tar.xz linux-dev-c0cd17f6dc7342a81b61017e6b84e363f86081c6.zip | |
Input: alps - cache firmware version
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/mouse/alps.c | 3 | ||||
| -rw-r--r-- | drivers/input/mouse/alps.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 8f794913f4cd..31b963dbf9a9 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -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 && diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h index 17e3ae39bcb7..e3d0f09aeeb3 100644 --- a/drivers/input/mouse/alps.h +++ b/drivers/input/mouse/alps.h @@ -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; |