diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-08-10 07:07:46 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-08-10 07:07:49 +0300 |
| commit | 4789fd48a313d36fe6b8fc1da5e0788f5ea074cb (patch) | |
| tree | 2c8c27b52f0e38abb7416ce81b04c3b85511b694 /drivers/hid/hid-alps.c | |
| parent | 8a9b346382056b52cd7ff141ae9f15a0fcfeb13d (diff) | |
| parent | d9939285fc818425ae92bd99f8c97b6b9ef3bb88 (diff) | |
| download | linux-dev-5.4.tar.xz | |
Merge tag 'v5.4.57' into dev-5.4dev-5.4
This is the 5.4.57 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/hid/hid-alps.c')
| -rw-r--r-- | drivers/hid/hid-alps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c index b2ad319a74b9..d33f5abc8f64 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c @@ -25,6 +25,7 @@ #define U1_MOUSE_REPORT_ID 0x01 /* Mouse data ReportID */ #define U1_ABSOLUTE_REPORT_ID 0x03 /* Absolute data ReportID */ +#define U1_ABSOLUTE_REPORT_ID_SECD 0x02 /* FW-PTP Absolute data ReportID */ #define U1_FEATURE_REPORT_ID 0x05 /* Feature ReportID */ #define U1_SP_ABSOLUTE_REPORT_ID 0x06 /* Feature ReportID */ @@ -368,6 +369,7 @@ static int u1_raw_event(struct alps_dev *hdata, u8 *data, int size) case U1_FEATURE_REPORT_ID: break; case U1_ABSOLUTE_REPORT_ID: + case U1_ABSOLUTE_REPORT_ID_SECD: for (i = 0; i < hdata->max_fingers; i++) { u8 *contact = &data[i * 5]; |