[ 3.5.y.z extended stable ] Patch "HID: add usage_index in struct hid_usage." has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    HID: add usage_index in struct hid_usage.

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From a321369339e0029f1a951f95566d518ba4b15daa Mon Sep 17 00:00:00 2001
From: Benjamin Tissoires <benjamin.tissoires at gmail.com>
Date: Wed, 14 Nov 2012 16:59:16 +0100
Subject: [PATCH] HID: add usage_index in struct hid_usage.

commit f262d1fa2c651a5e2f92b6aee8779597631cd5d4 upstream.

Currently, there is no way to know the index of the current field
in the .input_mapping and .event callbacks  when this field is inside
an array of HID fields.
This patch adds this index to the struct hid_usage so that this
information is available to input_mapping and event callbacks.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires at gmail.com>
Acked-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
[ luis: 3.5.y prereq for:
  cc6b54a HID: validate feature and input report details ]
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/hid/hid-core.c | 4 ++++
 include/linux/hid.h    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index d4111de..4043d73 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -94,6 +94,7 @@ EXPORT_SYMBOL_GPL(hid_register_report);
 static struct hid_field *hid_register_field(struct hid_report *report, unsigned usages, unsigned values)
 {
 	struct hid_field *field;
+	int i;

 	if (report->maxfield == HID_MAX_FIELDS) {
 		hid_err(report->device, "too many fields in report\n");
@@ -112,6 +113,9 @@ static struct hid_field *hid_register_field(struct hid_report *report, unsigned
 	field->value = (s32 *)(field->usage + usages);
 	field->report = report;

+	for (i = 0; i < usages; i++)
+		field->usage[i].usage_index = i;
+
 	return field;
 }

diff --git a/include/linux/hid.h b/include/linux/hid.h
index cdf6171..be1afbc 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -378,6 +378,7 @@ struct hid_collection {
 struct hid_usage {
 	unsigned  hid;			/* hid usage code */
 	unsigned  collection_index;	/* index into collection array */
+	unsigned  usage_index;		/* index into usage array */
 	/* hidinput data */
 	__u16     code;			/* input driver code */
 	__u8      type;			/* input driver type */
--
1.8.3.2