diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-03-26 15:45:38 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-03-26 15:45:38 +0300 |
| commit | b928908e9b5a0c43bef3f6bc18f79fc43fa3d52d (patch) | |
| tree | d5bf6fc542143bacf8e3ebe54fe66c7882f2a870 | |
| parent | 5d28bc6b495cf2eea50c4e9d8d866937a6695e61 (diff) | |
| parent | c600a55922640b1c4dcfdc5a694cadd2dd9d1599 (diff) | |
| download | linux-b928908e9b5a0c43bef3f6bc18f79fc43fa3d52d.tar.xz | |
Merge branch 'for-6.15/core' into for-linus
- differentiate warning for reserved item tag from unknown item tag, in
accordance to 6.2.2.4 from the HID specification 1.11 (Tatsuya S)
| -rw-r--r-- | drivers/hid/hid-core.c | 6 | ||||
| -rw-r--r-- | include/linux/hid.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 4497b50799db..4741ff626771 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -657,7 +657,11 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item) ret = hid_add_field(parser, HID_FEATURE_REPORT, data); break; default: - hid_warn(parser->device, "unknown main item tag 0x%x\n", item->tag); + if (item->tag >= HID_MAIN_ITEM_TAG_RESERVED_MIN && + item->tag <= HID_MAIN_ITEM_TAG_RESERVED_MAX) + hid_warn(parser->device, "reserved main item tag 0x%x\n", item->tag); + else + hid_warn(parser->device, "unknown main item tag 0x%x\n", item->tag); ret = 0; } diff --git a/include/linux/hid.h b/include/linux/hid.h index cdc0dc13c87f..3f01cd77f6d4 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -81,6 +81,8 @@ struct hid_item { #define HID_MAIN_ITEM_TAG_FEATURE 11 #define HID_MAIN_ITEM_TAG_BEGIN_COLLECTION 10 #define HID_MAIN_ITEM_TAG_END_COLLECTION 12 +#define HID_MAIN_ITEM_TAG_RESERVED_MIN 13 +#define HID_MAIN_ITEM_TAG_RESERVED_MAX 15 /* * HID report descriptor main item contents |