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

Merge branch 'for-4.20/core' into for-linus 

Fixes and new features for driver core. Highlights:

- maximum global item tag report size gets increased to 256
- improved INPUT_PROP reporting for Digitizer devices
parents 037ad063 8473a93d

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item) 


	case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:

		parser->global.report_size = item_udata(item);

		if (parser->global.report_size > 128) {

		if (parser->global.report_size > 256) {

			hid_err(parser->device, "invalid report_size %d\n",

					parser->global.report_size);

			return -1;

drivers/hid/hid-input.c

+15 −4
Original line number Diff line number Diff line
@@ -758,6 +758,11 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		break;



	case HID_UP_DIGITIZER:

		if ((field->application & 0xff) == 0x01) /* Digitizer */

			__set_bit(INPUT_PROP_POINTER, input->propbit);

		else if ((field->application & 0xff) == 0x02) /* Pen */

			__set_bit(INPUT_PROP_DIRECT, input->propbit);



		switch (usage->hid & 0xff) {

		case 0x00: /* Undefined */

			goto ignore;
@@ -1516,6 +1521,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid, 
	struct hid_input *hidinput = kzalloc(sizeof(*hidinput), GFP_KERNEL);

	struct input_dev *input_dev = input_allocate_device();

	const char *suffix = NULL;

	size_t suffix_len, name_len;



	if (!hidinput || !input_dev)

		goto fail;
@@ -1559,11 +1565,16 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid, 
	}



	if (suffix) {

		name_len = strlen(hid->name);

		suffix_len = strlen(suffix);

		if ((name_len < suffix_len) ||

		    strcmp(hid->name + name_len - suffix_len, suffix)) {

			hidinput->name = kasprintf(GFP_KERNEL, "%s %s",

						   hid->name, suffix);

			if (!hidinput->name)

				goto fail;

		}

	}



	input_set_drvdata(input_dev, hid);

	input_dev->event = hidinput_input_event;