Commit b928908e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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)
parents 5d28bc6b c600a559

drivers/hid/hid-core.c

+5 −1
Original line number Diff line number Diff line
@@ -657,6 +657,10 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item) 
		ret = hid_add_field(parser, HID_FEATURE_REPORT, data);

		break;

	default:

		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;

	}

include/linux/hid.h

+2 −0
Original line number Diff line number Diff line
@@ -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