3 files changed, 38 insertions, 2 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 6cb884638fda..1b8b33341408 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -566,6 +566,11 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x0e5: map_key_clear(KEY_BASSBOOST);       break;
                                 case 0x0e9: map_key_clear(KEY_VOLUMEUP);        break;
                                 case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);      break;
+
+                                /* reserved in HUT 1.12. Reported on Petalynx remote */
+                                case 0x0f6: map_key_clear(KEY_NEXT);            break;
+                                case 0x0fa: map_key_clear(KEY_BACK);            break;
+
                                 case 0x183: map_key_clear(KEY_CONFIG);          break;
                                 case 0x184: map_key_clear(KEY_WORDPROCESSOR);   break;
                                 case 0x185: map_key_clear(KEY_EDITOR);          break;
@@ -727,10 +732,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                         }
                         break;
 
-                case HID_UP_LOGIVENDOR: /* Reported on Logitech Ultra X Media Remote */
-
+                case HID_UP_LOGIVENDOR:
                         set_bit(EV_REP, input->evbit);
                         switch(usage->hid & HID_USAGE) {
+                                /* Reported on Logitech Ultra X Media Remote */
                                 case 0x004: map_key_clear(KEY_AGAIN);           break;
                                 case 0x00d: map_key_clear(KEY_HOME);            break;
                                 case 0x024: map_key_clear(KEY_SHUFFLE);         break;
@@ -748,6 +753,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x04d: map_key_clear(KEY_SUBTITLE);        break;
                                 case 0x051: map_key_clear(KEY_RED);             break;
                                 case 0x052: map_key_clear(KEY_CLOSE);           break;
+
+                                /* Reported on Petalynx Maxter remote */
+                                case 0x05a: map_key_clear(KEY_TEXT);            break;
+                                case 0x05b: map_key_clear(KEY_RED);             break;
+                                case 0x05c: map_key_clear(KEY_GREEN);           break;
+                                case 0x05d: map_key_clear(KEY_YELLOW);          break;
+                                case 0x05e: map_key_clear(KEY_BLUE);            break;
+
                                 default:    goto ignore;
                         }
                         break;
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 093abb5c9879..ef7b881aab3a 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -688,6 +688,21 @@ static void hid_fixup_logitech_descriptor(unsigned char *rdesc, int rsize)
         }
 }
 
+/* Petalynx Maxter Remote has maximum for consumer page set too low */
+static void hid_fixup_petalynx_descriptor(unsigned char *rdesc, int rsize)
+{
+        if (rsize >= 60 && rdesc[39] == 0x2a
+                        && rdesc[40] == 0xf5
+                        && rdesc[41] == 0x00
+                        && rdesc[59] == 0x26
+                        && rdesc[60] == 0xf9
+                        && rdesc[61] == 0x00) {
+                info("Fixing up Petalynx Maxter Remote report descriptor");
+                rdesc[60] = 0xfa;
+                rdesc[40] = 0xfa;
+        }
+}
+
 /*
  * Some USB barcode readers from cypress have usage min and usage max in
  * the wrong order
@@ -781,6 +796,9 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         if (quirks & HID_QUIRK_SWAPPED_MIN_MAX)
                 hid_fixup_cypress_descriptor(rdesc, rsize);
 
+        if (quirks & HID_QUIRK_PETALYNX_DESCRIPTOR)
+                hid_fixup_petalynx_descriptor(rdesc, rsize);
+
 #ifdef CONFIG_HID_DEBUG
         printk(KERN_DEBUG __FILE__ ": report descriptor (size %u, read %d) = ", rsize, n);
         for (n = 0; n < rsize; n++)
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index a320c24ea6e8..ad8a4ac8e43c 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -226,6 +226,9 @@
 #define USB_VENDOR_ID_PANTHERLORD       0x0810
 #define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK     0x0001
 
+#define USB_VENDOR_ID_PETALYNX          0x18b1
+#define USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE    0x0037
+
 #define USB_VENDOR_ID_PLAYDOTCOM        0x0b43
 #define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII      0x0003
 
@@ -426,6 +429,8 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
         { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
 
+        { USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, HID_QUIRK_PETALYNX_DESCRIPTOR | HID_QUIRK_NOGET },
+
         { USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER },
 
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },