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

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
  HID: fix Logitech DiNovo Edge touchwheel and Logic3 /SpectraVideo middle button
  HID: add git tree information to MAINTAINERS
  HID: fix broken Logitech S510 keyboard report descriptor; make extra keys work
  HID: fix possible double-free on error path in hid parser
  HID: hid-debug.c should #include <linux/hid-debug.h>
  HID: fix bug in zeroing the last field byte in output reports
  USB HID: use CONFIG_HID_DEBUG for outputting report descriptor
  USB HID: Fix USB vendor and product IDs endianness for USB HID devices

1 files changed, 31 insertions, 6 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 25d180a24fc4..c8434023ba65 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -2,7 +2,7 @@
  * $Id: hid-input.c,v 1.2 2002/04/23 00:59:25 rdamazio Exp $
  *
  *  Copyright (c) 2000-2001 Vojtech Pavlik
- *  Copyright (c) 2006 Jiri Kosina
+ *  Copyright (c) 2006-2007 Jiri Kosina
  *
  *  HID to Linux Input mapping
  */
@@ -71,7 +71,6 @@ static const struct {
 #define map_led(c)      do { usage->code = c; usage->type = EV_LED; bit = input->ledbit; max = LED_MAX; } while (0)
 
 #define map_abs_clear(c)        do { map_abs(c); clear_bit(c, bit); } while (0)
-#define map_rel_clear(c)        do { map_rel(c); clear_bit(c, bit); } while (0)
 #define map_key_clear(c)        do { map_key(c); clear_bit(c, bit); } while (0)
 
 #ifdef CONFIG_USB_HIDINPUT_POWERBOOK
@@ -296,7 +295,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                         }
                         }
 
-                        map_key_clear(code);
+                        map_key(code);
                         break;
 
 
@@ -347,9 +346,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case HID_GD_RX: case HID_GD_RY: case HID_GD_RZ:
                                 case HID_GD_SLIDER: case HID_GD_DIAL: case HID_GD_WHEEL:
                                         if (field->flags & HID_MAIN_ITEM_RELATIVE)
-                                                map_rel_clear(usage->hid & 0xf);
+                                                map_rel(usage->hid & 0xf);
                                         else
-                                                map_abs_clear(usage->hid & 0xf);
+                                                map_abs(usage->hid & 0xf);
                                         break;
 
                                 case HID_GD_HATSWITCH:
@@ -519,7 +518,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x22f: map_key_clear(KEY_ZOOMRESET);       break;
                                 case 0x233: map_key_clear(KEY_SCROLLUP);        break;
                                 case 0x234: map_key_clear(KEY_SCROLLDOWN);      break;
-                                case 0x238: map_rel_clear(REL_HWHEEL);          break;
+                                case 0x238: map_rel(REL_HWHEEL);                break;
                                 case 0x25f: map_key_clear(KEY_CANCEL);          break;
                                 case 0x279: map_key_clear(KEY_REDO);            break;
 
@@ -532,6 +531,26 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x302: map_key_clear(KEY_PROG2);           break;
                                 case 0x303: map_key_clear(KEY_PROG3);           break;
 
+                                /* Reported on Logitech S510 wireless keyboard */
+                                case 0x101f: map_key_clear(KEY_ZOOMIN);         break;
+                                case 0x1020: map_key_clear(KEY_ZOOMOUT);        break;
+                                case 0x1021: map_key_clear(KEY_ZOOMRESET);      break;
+                                /* this one is marked as 'Rotate' */
+                                case 0x1028: map_key_clear(KEY_ANGLE);          break;
+                                case 0x1029: map_key_clear(KEY_SHUFFLE);        break;
+                                case 0x1041: map_key_clear(KEY_BATTERY);        break;
+                                case 0x1042: map_key_clear(KEY_WORDPROCESSOR);  break;
+                                case 0x1043: map_key_clear(KEY_SPREADSHEET);    break;
+                                case 0x1044: map_key_clear(KEY_PRESENTATION);   break;
+                                case 0x1045: map_key_clear(KEY_UNDO);           break;
+                                case 0x1046: map_key_clear(KEY_REDO);           break;
+                                case 0x1047: map_key_clear(KEY_PRINT);          break;
+                                case 0x1048: map_key_clear(KEY_SAVE);           break;
+                                case 0x1049: map_key_clear(KEY_PROG1);          break;
+                                case 0x104a: map_key_clear(KEY_PROG2);          break;
+                                case 0x104b: map_key_clear(KEY_PROG3);          break;
+                                case 0x104c: map_key_clear(KEY_PROG4);          break;
+
                                 default:    goto ignore;
                         }
                         break;
@@ -647,6 +666,12 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
         set_bit(usage->type, input->evbit);
 
+        if (device->quirks & HID_QUIRK_DUPLICATE_USAGES &&
+                        (usage->type == EV_KEY ||
+                         usage->type == EV_REL ||
+                         usage->type == EV_ABS))
+                clear_bit(usage->code, bit);
+
         while (usage->code <= max && test_and_set_bit(usage->code, bit))
                 usage->code = find_next_zero_bit(bit, max + 1, usage->code);