Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (48 commits)
  HID: add support for Logitech Driving Force Pro wheel
  HID: hid-ortek: remove spurious reference
  HID: add support for Ortek PKB-1700
  HID: roccat-koneplus: vorrect mode of sysfs attr 'sensor'
  HID: hid-ntrig: init settle and mode check
  HID: merge hid-egalax into hid-multitouch
  HID: hid-multitouch: Send events per slot if CONTACTCOUNT is missing
  HID: ntrig remove if and drop an indent
  HID: ACRUX - activate the device immediately after binding
  HID: ntrig: apply NO_INIT_REPORTS quirk
  HID: hid-magicmouse: Correct touch orientation direction
  HID: ntrig don't dereference unclaimed hidinput
  HID: Do not create input devices for feature reports
  HID: bt hidp: send Output reports using SET_REPORT on the Control channel
  HID: hid-sony.c: Fix sending Output reports to the Sixaxis
  HID: add support for Keytouch IEC 60945
  HID: Add HID Report Descriptor to sysfs
  HID: add IRTOUCH infrared USB to hid_have_special_driver
  HID: kernel oops in out_cleanup in function hidinput_connect
  HID: Add teletext/color keys - gyration remote - EU version (GYAR3101CKDE)
  ...

1 files changed, 22 insertions, 9 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 7f552bfad32c..cd74203c8178 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;
@@ -928,6 +940,7 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
         return 0;
 
 out_cleanup:
+        list_del(&hidinput->list);
         input_free_device(hidinput->input);
         kfree(hidinput);
 out_unwind: