3 files changed, 15 insertions, 4 deletions

diff --git a/usr/src/dkms_source_tree/hid-core.c b/usr/src/dkms_source_tree/hid-core.c
index 48a0a2f..9477b2a 100644
--- a/usr/src/dkms_source_tree/hid-core.c
+++ b/usr/src/dkms_source_tree/hid-core.c
@@ -1256,9 +1256,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
         { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
         { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
-#if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE)
         { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
-#endif
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
@@ -1403,6 +1401,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },
         { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },
         { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
         { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
         { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
diff --git a/usr/src/dkms_source_tree/hid-ids.h b/usr/src/dkms_source_tree/hid-ids.h
index ca32ecb..090bf48 100644
--- a/usr/src/dkms_source_tree/hid-ids.h
+++ b/usr/src/dkms_source_tree/hid-ids.h
@@ -469,6 +469,7 @@
 #define USB_DEVICE_ID_ONTRAK_ADU100     0x0064
 
 #define USB_VENDOR_ID_ORTEK             0x05a4
+#define USB_DEVICE_ID_ORTEK_PKB1700     0x1700
 #define USB_DEVICE_ID_ORTEK_WKB2000     0x2000
 
 #define USB_VENDOR_ID_PANJIT            0x134c
diff --git a/usr/src/dkms_source_tree/hid-input.c b/usr/src/dkms_source_tree/hid-input.c
index 05709e3..ebcc02a 100644
--- a/usr/src/dkms_source_tree/hid-input.c
+++ b/usr/src/dkms_source_tree/hid-input.c
@@ -829,9 +829,20 @@ static void hidinput_close(struct input_dev *dev)
 
 static void report_features(struct hid_device *hid)
 {
-        /* no feature report support in this test, since it is in flux */
+        struct hid_driver *drv = hid->driver;
+        struct hid_report_enum *rep_enum;
+        struct hid_report *rep;
+        int i, j;
 
-        return;
+        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);
 }
 
 /*