3 files changed, 23 insertions, 11 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 7f552bfad32c..ebcc02a1c1c9 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -290,14 +290,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                 goto ignore;
         }
 
-        if (field->report_type == HID_FEATURE_REPORT) {
-                if (device->driver->feature_mapping) {
-                        device->driver->feature_mapping(device, hidinput, field,
-                                usage);
-                }
-                goto ignore;
-        }
-
         if (device->driver->input_mapping) {
                 int ret = device->driver->input_mapping(device, hidinput, field,
                                 usage, &bit, &max);
@@ -835,6 +827,24 @@ static void hidinput_close(struct input_dev *dev)
         hid_hw_close(hid);
 }
 
+static void report_features(struct hid_device *hid)
+{
+        struct hid_driver *drv = hid->driver;
+        struct hid_report_enum *rep_enum;
+        struct hid_report *rep;
+        int i, j;
+
+        if (!drv->feature_mapping)
+                return;
+
+        rep_enum = &hid->report_enum[HID_FEATURE_REPORT];
+        list_for_each_entry(rep, &rep_enum->report_list, list)
+                for (i = 0; i < rep->maxfield; i++)
+                        for (j = 0; j < rep->field[i]->maxusage; j++)
+                                drv->feature_mapping(hid, rep->field[i],
+                                                     rep->field[i]->usage + j);
+}
+
 /*
  * Register the input device; print a message.
  * Configure the input layer interface
@@ -863,7 +873,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
                         return -1;
         }
 
-        for (k = HID_INPUT_REPORT; k <= HID_FEATURE_REPORT; k++) {
+        report_features(hid);
+
+        for (k = HID_INPUT_REPORT; k <= HID_OUTPUT_REPORT; k++) {
                 if (k == HID_OUTPUT_REPORT &&
                         hid->quirks & HID_QUIRK_SKIP_OUTPUT_REPORTS)
                         continue;
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 07d3183fdde5..2bbc9545f5cc 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -122,7 +122,7 @@ struct mt_class mt_classes[] = {
         { }
 };
 
-static void mt_feature_mapping(struct hid_device *hdev, struct hid_input *hi,
+static void mt_feature_mapping(struct hid_device *hdev,
                 struct hid_field *field, struct hid_usage *usage)
 {
         if (usage->hid == HID_DG_INPUTMODE) {
diff --git a/include/linux/hid.h b/include/linux/hid.h
index d91c25e253c8..fc5faf60f6df 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -638,7 +638,7 @@ struct hid_driver {
                         struct hid_input *hidinput, struct hid_field *field,
                         struct hid_usage *usage, unsigned long **bit, int *max);
         void (*feature_mapping)(struct hid_device *hdev,
-                        struct hid_input *hidinput, struct hid_field *field,
+                        struct hid_field *field,
                         struct hid_usage *usage);
 #ifdef CONFIG_PM
         int (*suspend)(struct hid_device *hdev, pm_message_t message);