Merge "HID: make arrays usage and value to be the same" (58820fb7) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/hid/hid-core.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -91,7 +91,7 @@ EXPORT_SYMBOL_GPL(hid_register_report);
	* Register a new field for this report.		* Register a new field for this report.
	*/		*/

	static struct hid_field hid_register_field(struct hid_report report, unsigned usages, unsigned values)		static struct hid_field hid_register_field(struct hid_report report, unsigned usages)
	{		{
	struct hid_field *field;		struct hid_field *field;

	@@ -102,7 +102,7 @@ static struct hid_field hid_register_field(struct hid_report report, unsigned

	field = kzalloc((sizeof(struct hid_field) +		field = kzalloc((sizeof(struct hid_field) +
	usages * sizeof(struct hid_usage) +		usages * sizeof(struct hid_usage) +
	values * sizeof(unsigned)), GFP_KERNEL);		usages * sizeof(unsigned)), GFP_KERNEL);
	if (!field)		if (!field)
	return NULL;		return NULL;

	@@ -281,7 +281,7 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
	usages = max_t(unsigned, parser->local.usage_index,		usages = max_t(unsigned, parser->local.usage_index,
	parser->global.report_count);		parser->global.report_count);

	field = hid_register_field(report, usages, parser->global.report_count);		field = hid_register_field(report, usages);
	if (!field)		if (!field)
	return 0;		return 0;