Merge ../torvalds-2.6/

5 files changed, 154 insertions, 32 deletions

diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 1ab95d24c5e2..e108e0a36b74 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -2,7 +2,8 @@
  *  USB HID support for Linux
  *
  *  Copyright (c) 1999 Andreas Gal
- *  Copyright (c) 2000-2001 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
  */
 
 /*
@@ -38,7 +39,7 @@
  * Version Information
  */
 
-#define DRIVER_VERSION "v2.01"
+#define DRIVER_VERSION "v2.6"
 #define DRIVER_AUTHOR "Andreas Gal, Vojtech Pavlik"
 #define DRIVER_DESC "USB HID core driver"
 #define DRIVER_LICENSE "GPL"
@@ -1058,8 +1059,8 @@ static int hid_submit_ctrl(struct hid_device *hid)
                 if (maxpacket > 0) {
                         padlen = (len + maxpacket - 1) / maxpacket;
                         padlen *= maxpacket;
-                        if (padlen > HID_BUFFER_SIZE)
-                                padlen = HID_BUFFER_SIZE;
+                        if (padlen > hid->bufsize)
+                                padlen = hid->bufsize;
                 } else
                         padlen = 0;
                 hid->urbctrl->transfer_buffer_length = padlen;
@@ -1096,6 +1097,7 @@ static void hid_irq_out(struct urb *urb, struct pt_regs *regs)
 
         switch (urb->status) {
                 case 0:                 /* success */
+                        break;
                 case -ESHUTDOWN:        /* unplug */
                 case -EILSEQ:           /* unplug timeout on uhci */
                         unplug = 1;
@@ -1143,6 +1145,7 @@ static void hid_ctrl(struct urb *urb, struct pt_regs *regs)
                 case 0:                 /* success */
                         if (hid->ctrl[hid->ctrltail].dir == USB_DIR_IN)
                                 hid_input_report(hid->ctrl[hid->ctrltail].report->type, urb, 0, regs);
+                        break;
                 case -ESHUTDOWN:        /* unplug */
                 case -EILSEQ:           /* unplug timectrl on uhci */
                         unplug = 1;
@@ -1284,13 +1287,8 @@ void hid_init_reports(struct hid_device *hid)
         struct hid_report *report;
         int err, ret;
 
-        list_for_each_entry(report, &hid->report_enum[HID_INPUT_REPORT].report_list, list) {
-                int size = ((report->size - 1) >> 3) + 1 + hid->report_enum[HID_INPUT_REPORT].numbered;
-                if (size > HID_BUFFER_SIZE) size = HID_BUFFER_SIZE;
-                if (size > hid->urbin->transfer_buffer_length)
-                        hid->urbin->transfer_buffer_length = size;
+        list_for_each_entry(report, &hid->report_enum[HID_INPUT_REPORT].report_list, list)
                 hid_submit_report(hid, report, USB_DIR_IN);
-        }
 
         list_for_each_entry(report, &hid->report_enum[HID_FEATURE_REPORT].report_list, list)
                 hid_submit_report(hid, report, USB_DIR_IN);
@@ -1372,12 +1370,14 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_VENDOR_ID_A4TECH            0x09da
 #define USB_DEVICE_ID_A4TECH_WCP32PU    0x0006
 
-#define USB_VENDOR_ID_AASHIMA           0x06D6
+#define USB_VENDOR_ID_AASHIMA           0x06d6
 #define USB_DEVICE_ID_AASHIMA_GAMEPAD   0x0025
+#define USB_DEVICE_ID_AASHIMA_PREDATOR  0x0026
 
 #define USB_VENDOR_ID_CYPRESS           0x04b4
 #define USB_DEVICE_ID_CYPRESS_MOUSE     0x0001
 #define USB_DEVICE_ID_CYPRESS_HIDCOM    0x5500
+#define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE        0x7417
 
 #define USB_VENDOR_ID_BERKSHIRE         0x0c98
 #define USB_DEVICE_ID_BERKSHIRE_PCWD    0x1140
@@ -1432,7 +1432,7 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_DEVICE_ID_VERNIER_CYCLOPS   0x0004
 
 #define USB_VENDOR_ID_LD                0x0f11
-#define USB_DEVICE_ID_CASSY             0x1000
+#define USB_DEVICE_ID_CASSY             0x1000
 #define USB_DEVICE_ID_POCKETCASSY       0x1010
 #define USB_DEVICE_ID_MOBILECASSY       0x1020
 #define USB_DEVICE_ID_JWM               0x1080
@@ -1445,7 +1445,8 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_DEVICE_ID_POWERCONTROL      0x2030
 
 #define USB_VENDOR_ID_APPLE             0x05ac
-#define USB_DEVICE_ID_APPLE_BLUETOOTH   0x1000
+#define USB_DEVICE_ID_APPLE_POWERMOUSE  0x0304
+#define USB_DEVICE_ID_APPLE_BLUETOOTH   0x1000
 
 /*
  * Alphabetically sorted blacklist by quirk type.
@@ -1471,6 +1472,7 @@ static struct hid_blacklist {
         { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW48, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE },
@@ -1551,10 +1553,12 @@ static struct hid_blacklist {
         { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},
         { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },
 
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },
         { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },
         { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE, HID_QUIRK_2WHEEL_MOUSE_HACK_5 },
 
         { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_GAMEPAD, HID_QUIRK_BADPAD },
+        { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
@@ -1567,15 +1571,32 @@ static struct hid_blacklist {
         { 0, 0 }
 };
 
+/*
+ * Traverse the supplied list of reports and find the longest
+ */
+static void hid_find_max_report(struct hid_device *hid, unsigned int type, int *max)
+{
+        struct hid_report *report;
+        int size;
+
+        list_for_each_entry(report, &hid->report_enum[type].report_list, list) {
+                size = ((report->size - 1) >> 3) + 1;
+                if (type == HID_INPUT_REPORT && hid->report_enum[type].numbered)
+                        size++;
+                if (*max < size)
+                        *max = size;
+        }
+}
+
 static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid)
 {
-        if (!(hid->inbuf = usb_buffer_alloc(dev, HID_BUFFER_SIZE, SLAB_ATOMIC, &hid->inbuf_dma)))
+        if (!(hid->inbuf = usb_buffer_alloc(dev, hid->bufsize, SLAB_ATOMIC, &hid->inbuf_dma)))
                 return -1;
-        if (!(hid->outbuf = usb_buffer_alloc(dev, HID_BUFFER_SIZE, SLAB_ATOMIC, &hid->outbuf_dma)))
+        if (!(hid->outbuf = usb_buffer_alloc(dev, hid->bufsize, SLAB_ATOMIC, &hid->outbuf_dma)))
                 return -1;
         if (!(hid->cr = usb_buffer_alloc(dev, sizeof(*(hid->cr)), SLAB_ATOMIC, &hid->cr_dma)))
                 return -1;
-        if (!(hid->ctrlbuf = usb_buffer_alloc(dev, HID_BUFFER_SIZE, SLAB_ATOMIC, &hid->ctrlbuf_dma)))
+        if (!(hid->ctrlbuf = usb_buffer_alloc(dev, hid->bufsize, SLAB_ATOMIC, &hid->ctrlbuf_dma)))
                 return -1;
 
         return 0;
@@ -1584,13 +1605,13 @@ static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid)
 static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid)
 {
         if (hid->inbuf)
-                usb_buffer_free(dev, HID_BUFFER_SIZE, hid->inbuf, hid->inbuf_dma);
+                usb_buffer_free(dev, hid->bufsize, hid->inbuf, hid->inbuf_dma);
         if (hid->outbuf)
-                usb_buffer_free(dev, HID_BUFFER_SIZE, hid->outbuf, hid->outbuf_dma);
+                usb_buffer_free(dev, hid->bufsize, hid->outbuf, hid->outbuf_dma);
         if (hid->cr)
                 usb_buffer_free(dev, sizeof(*(hid->cr)), hid->cr, hid->cr_dma);
         if (hid->ctrlbuf)
-                usb_buffer_free(dev, HID_BUFFER_SIZE, hid->ctrlbuf, hid->ctrlbuf_dma);
+                usb_buffer_free(dev, hid->bufsize, hid->ctrlbuf, hid->ctrlbuf_dma);
 }
 
 static struct hid_device *usb_hid_configure(struct usb_interface *intf)
@@ -1601,7 +1622,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         struct hid_device *hid;
         unsigned quirks = 0, rsize = 0;
         char *buf, *rdesc;
-        int n;
+        int n, insize = 0;
 
         for (n = 0; hid_blacklist[n].idVendor; n++)
                 if ((hid_blacklist[n].idVendor == le16_to_cpu(dev->descriptor.idVendor)) &&
@@ -1655,6 +1676,19 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
         kfree(rdesc);
         hid->quirks = quirks;
 
+        hid->bufsize = HID_MIN_BUFFER_SIZE;
+        hid_find_max_report(hid, HID_INPUT_REPORT, &hid->bufsize);
+        hid_find_max_report(hid, HID_OUTPUT_REPORT, &hid->bufsize);
+        hid_find_max_report(hid, HID_FEATURE_REPORT, &hid->bufsize);
+
+        if (hid->bufsize > HID_MAX_BUFFER_SIZE)
+                hid->bufsize = HID_MAX_BUFFER_SIZE;
+
+        hid_find_max_report(hid, HID_INPUT_REPORT, &insize);
+
+        if (insize > HID_MAX_BUFFER_SIZE)
+                insize = HID_MAX_BUFFER_SIZE;
+
         if (hid_alloc_buffers(dev, hid)) {
                 hid_free_buffers(dev, hid);
                 goto fail;
@@ -1685,7 +1719,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                         if (!(hid->urbin = usb_alloc_urb(0, GFP_KERNEL)))
                                 goto fail;
                         pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
-                        usb_fill_int_urb(hid->urbin, dev, pipe, hid->inbuf, 0,
+                        usb_fill_int_urb(hid->urbin, dev, pipe, hid->inbuf, insize,
                                          hid_irq_in, hid, interval);
                         hid->urbin->transfer_dma = hid->inbuf_dma;
                         hid->urbin->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
diff --git a/drivers/usb/input/hid-debug.h b/drivers/usb/input/hid-debug.h
index 52437e5e2e78..ceebab99eff2 100644
--- a/drivers/usb/input/hid-debug.h
+++ b/drivers/usb/input/hid-debug.h
@@ -85,6 +85,23 @@ static const struct hid_usage_entry hid_usage_table[] = {
       {0, 0x91, "D-PadDown"},
       {0, 0x92, "D-PadRight"},
       {0, 0x93, "D-PadLeft"},
+  {  2, 0, "Simulation" },
+      {0, 0xb0, "Aileron"},
+      {0, 0xb1, "AileronTrim"},
+      {0, 0xb2, "Anti-Torque"},
+      {0, 0xb3, "Autopilot"},
+      {0, 0xb4, "Chaff"},
+      {0, 0xb5, "Collective"},
+      {0, 0xb6, "DiveBrake"},
+      {0, 0xb7, "ElectronicCountermeasures"},
+      {0, 0xb8, "Elevator"},
+      {0, 0xb9, "ElevatorTrim"},
+      {0, 0xba, "Rudder"},
+      {0, 0xbb, "Throttle"},
+      {0, 0xbc, "FlightCommunications"},
+      {0, 0xbd, "FlareRelease"},
+      {0, 0xbe, "LandingGear"},
+      {0, 0xbf, "ToeBrake"},
   {  7, 0, "Keyboard" },
   {  8, 0, "LED" },
       {0, 0x01, "NumLock"},
@@ -92,6 +109,7 @@ static const struct hid_usage_entry hid_usage_table[] = {
       {0, 0x03, "ScrollLock"},
       {0, 0x04, "Compose"},
       {0, 0x05, "Kana"},
+      {0, 0x4b, "GenericIndicator"},
   {  9, 0, "Button" },
   { 10, 0, "Ordinal" },
   { 12, 0, "Consumer" },
@@ -574,7 +592,8 @@ static char *keys[KEY_MAX + 1] = {
         [KEY_EXIT] = "Exit",                    [KEY_MOVE] = "Move",
         [KEY_EDIT] = "Edit",                    [KEY_SCROLLUP] = "ScrollUp",
         [KEY_SCROLLDOWN] = "ScrollDown",        [KEY_KPLEFTPAREN] = "KPLeftParenthesis",
-        [KEY_KPRIGHTPAREN] = "KPRightParenthesis", [KEY_F13] = "F13",
+        [KEY_KPRIGHTPAREN] = "KPRightParenthesis", [KEY_NEW] = "New",
+        [KEY_REDO] = "Redo",                    [KEY_F13] = "F13",
         [KEY_F14] = "F14",                      [KEY_F15] = "F15",
         [KEY_F16] = "F16",                      [KEY_F17] = "F17",
         [KEY_F18] = "F18",                      [KEY_F19] = "F19",
@@ -584,15 +603,15 @@ static char *keys[KEY_MAX + 1] = {
         [KEY_PAUSECD] = "PauseCD",              [KEY_PROG3] = "Prog3",
         [KEY_PROG4] = "Prog4",                  [KEY_SUSPEND] = "Suspend",
         [KEY_CLOSE] = "Close",                  [KEY_PLAY] = "Play",
-        [KEY_FASTFORWARD] = "Fast Forward",     [KEY_BASSBOOST] = "Bass Boost",
+        [KEY_FASTFORWARD] = "FastForward",      [KEY_BASSBOOST] = "BassBoost",
         [KEY_PRINT] = "Print",                  [KEY_HP] = "HP",
         [KEY_CAMERA] = "Camera",                [KEY_SOUND] = "Sound",
         [KEY_QUESTION] = "Question",            [KEY_EMAIL] = "Email",
         [KEY_CHAT] = "Chat",                    [KEY_SEARCH] = "Search",
         [KEY_CONNECT] = "Connect",              [KEY_FINANCE] = "Finance",
         [KEY_SPORT] = "Sport",                  [KEY_SHOP] = "Shop",
-        [KEY_ALTERASE] = "Alternate Erase",     [KEY_CANCEL] = "Cancel",
-        [KEY_BRIGHTNESSDOWN] = "Brightness down", [KEY_BRIGHTNESSUP] = "Brightness up",
+        [KEY_ALTERASE] = "AlternateErase",      [KEY_CANCEL] = "Cancel",
+        [KEY_BRIGHTNESSDOWN] = "BrightnessDown", [KEY_BRIGHTNESSUP] = "BrightnessUp",
         [KEY_MEDIA] = "Media",                  [KEY_UNKNOWN] = "Unknown",
         [BTN_0] = "Btn0",                       [BTN_1] = "Btn1",
         [BTN_2] = "Btn2",                       [BTN_3] = "Btn3",
@@ -622,8 +641,8 @@ static char *keys[KEY_MAX + 1] = {
         [BTN_TOOL_AIRBRUSH] = "ToolAirbrush",   [BTN_TOOL_FINGER] = "ToolFinger",
         [BTN_TOOL_MOUSE] = "ToolMouse",         [BTN_TOOL_LENS] = "ToolLens",
         [BTN_TOUCH] = "Touch",                  [BTN_STYLUS] = "Stylus",
-        [BTN_STYLUS2] = "Stylus2",              [BTN_TOOL_DOUBLETAP] = "Tool Doubletap",
-        [BTN_TOOL_TRIPLETAP] = "Tool Tripletap", [BTN_GEAR_DOWN] = "WheelBtn",
+        [BTN_STYLUS2] = "Stylus2",              [BTN_TOOL_DOUBLETAP] = "ToolDoubleTap",
+        [BTN_TOOL_TRIPLETAP] = "ToolTripleTap", [BTN_GEAR_DOWN] = "WheelBtn",
         [BTN_GEAR_UP] = "Gear up",              [KEY_OK] = "Ok",
         [KEY_SELECT] = "Select",                [KEY_GOTO] = "Goto",
         [KEY_CLEAR] = "Clear",                  [KEY_POWER2] = "Power2",
@@ -659,6 +678,9 @@ static char *keys[KEY_MAX + 1] = {
         [KEY_TWEN] = "TWEN",                    [KEY_DEL_EOL] = "DeleteEOL",
         [KEY_DEL_EOS] = "DeleteEOS",            [KEY_INS_LINE] = "InsertLine",
         [KEY_DEL_LINE] = "DeleteLine",
+        [KEY_SEND] = "Send",                    [KEY_REPLY] = "Reply",
+        [KEY_FORWARDMAIL] = "ForwardMail",      [KEY_SAVE] = "Save",
+        [KEY_DOCUMENTS] = "Documents",
 };
 
 static char *relatives[REL_MAX + 1] = {
diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
index 63a4db721f7e..0b6452248a39 100644
--- a/drivers/usb/input/hid-input.c
+++ b/drivers/usb/input/hid-input.c
@@ -78,8 +78,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 {
         struct input_dev *input = &hidinput->input;
         struct hid_device *device = hidinput->input.private;
-        int max, code;
-        unsigned long *bit;
+        int max = 0, code;
+        unsigned long *bit = NULL;
 
         field->hidinput = hidinput;
 
@@ -131,6 +131,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                         map_key(code);
                         break;
 
+
+                case HID_UP_SIMULATION:
+
+                        switch (usage->hid & 0xffff) {
+                                case 0xba: map_abs(ABS_RUDDER); break;
+                                case 0xbb: map_abs(ABS_THROTTLE); break;
+                        }
+                        break;
+
                 case HID_UP_GENDESK:
 
                         if ((usage->hid & 0xf0) == 0x80) {      /* SystemControl */
@@ -238,8 +247,12 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x000: goto ignore;
                                 case 0x034: map_key_clear(KEY_SLEEP);           break;
                                 case 0x036: map_key_clear(BTN_MISC);            break;
+                                case 0x045: map_key_clear(KEY_RADIO);           break;
                                 case 0x08a: map_key_clear(KEY_WWW);             break;
+                                case 0x08d: map_key_clear(KEY_PROGRAM);         break;
                                 case 0x095: map_key_clear(KEY_HELP);            break;
+                                case 0x09c: map_key_clear(KEY_CHANNELUP);       break;
+                                case 0x09d: map_key_clear(KEY_CHANNELDOWN);     break;
                                 case 0x0b0: map_key_clear(KEY_PLAY);            break;
                                 case 0x0b1: map_key_clear(KEY_PAUSE);           break;
                                 case 0x0b2: map_key_clear(KEY_RECORD);          break;
@@ -259,6 +272,11 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x18a: map_key_clear(KEY_MAIL);            break;
                                 case 0x192: map_key_clear(KEY_CALC);            break;
                                 case 0x194: map_key_clear(KEY_FILE);            break;
+                                case 0x1a7: map_key_clear(KEY_DOCUMENTS);       break;
+                                case 0x201: map_key_clear(KEY_NEW);             break;
+                                case 0x207: map_key_clear(KEY_SAVE);            break;
+                                case 0x208: map_key_clear(KEY_PRINT);           break;
+                                case 0x209: map_key_clear(KEY_PROPS);           break;
                                 case 0x21a: map_key_clear(KEY_UNDO);            break;
                                 case 0x21b: map_key_clear(KEY_COPY);            break;
                                 case 0x21c: map_key_clear(KEY_CUT);             break;
@@ -271,7 +289,11 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x227: map_key_clear(KEY_REFRESH);         break;
                                 case 0x22a: map_key_clear(KEY_BOOKMARKS);       break;
                                 case 0x238: map_rel(REL_HWHEEL);                break;
-                                default:    goto unknown;
+                                case 0x279: map_key_clear(KEY_REDO);            break;
+                                case 0x289: map_key_clear(KEY_REPLY);           break;
+                                case 0x28b: map_key_clear(KEY_FORWARDMAIL);     break;
+                                case 0x28c: map_key_clear(KEY_SEND);            break;
+                                default:    goto ignore;
                         }
                         break;
 
@@ -296,9 +318,42 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                         break;
 
                 case HID_UP_MSVENDOR:
-
                         goto ignore;
 
+                case HID_UP_CUSTOM: /* Reported on Logitech and Powerbook USB keyboards */
+
+                        set_bit(EV_REP, input->evbit);
+                        switch(usage->hid & HID_USAGE) {
+                                case 0x003: map_key_clear(KEY_FN);              break;
+                                default:    goto ignore;
+                        }
+                        break;
+
+                case HID_UP_LOGIVENDOR: /* Reported on Logitech Ultra X Media Remote */
+
+                        set_bit(EV_REP, input->evbit);
+                        switch(usage->hid & HID_USAGE) {
+                                case 0x004: map_key_clear(KEY_AGAIN);           break;
+                                case 0x00d: map_key_clear(KEY_HOME);            break;
+                                case 0x024: map_key_clear(KEY_SHUFFLE);         break;
+                                case 0x025: map_key_clear(KEY_TV);              break;
+                                case 0x026: map_key_clear(KEY_MENU);            break;
+                                case 0x031: map_key_clear(KEY_AUDIO);           break;
+                                case 0x032: map_key_clear(KEY_SUBTITLE);        break;
+                                case 0x033: map_key_clear(KEY_LAST);            break;
+                                case 0x047: map_key_clear(KEY_MP3);             break;
+                                case 0x048: map_key_clear(KEY_DVD);             break;
+                                case 0x049: map_key_clear(KEY_MEDIA);           break;
+                                case 0x04a: map_key_clear(KEY_VIDEO);           break;
+                                case 0x04b: map_key_clear(KEY_ANGLE);           break;
+                                case 0x04c: map_key_clear(KEY_LANGUAGE);        break;
+                                case 0x04d: map_key_clear(KEY_SUBTITLE);        break;
+                                case 0x051: map_key_clear(KEY_RED);             break;
+                                case 0x052: map_key_clear(KEY_CLOSE);           break;
+                                default:    goto ignore;
+                        }
+                        break;
+
                 case HID_UP_PID:
 
                         set_bit(EV_FF, input->evbit);
@@ -349,6 +404,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
         if (usage->code > max)
                 goto ignore;
 
+        if (((device->quirks & (HID_QUIRK_2WHEEL_POWERMOUSE)) && (usage->hid == 0x00010032)))
+                map_rel(REL_HWHEEL);
+
         if ((device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_7 | HID_QUIRK_2WHEEL_MOUSE_HACK_5)) &&
                  (usage->type == EV_REL) && (usage->code == REL_WHEEL))
                         set_bit(REL_HWHEEL, bit);
diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h
index c1b6b69bc4a4..ec2412c42f1e 100644
--- a/drivers/usb/input/hid.h
+++ b/drivers/usb/input/hid.h
@@ -173,6 +173,7 @@ struct hid_item {
 
 #define HID_UP_UNDEFINED        0x00000000
 #define HID_UP_GENDESK          0x00010000
+#define HID_UP_SIMULATION       0x00020000
 #define HID_UP_KEYBOARD         0x00070000
 #define HID_UP_LED              0x00080000
 #define HID_UP_BUTTON           0x00090000
@@ -182,6 +183,8 @@ struct hid_item {
 #define HID_UP_PID              0x000f0000
 #define HID_UP_HPVENDOR         0xff7f0000
 #define HID_UP_MSVENDOR         0xff000000
+#define HID_UP_CUSTOM           0x00ff0000
+#define HID_UP_LOGIVENDOR       0xffbc0000
 
 #define HID_USAGE               0x0000ffff
 
@@ -242,6 +245,7 @@ struct hid_item {
 #define HID_QUIRK_2WHEEL_MOUSE_HACK_7           0x080
 #define HID_QUIRK_2WHEEL_MOUSE_HACK_5           0x100
 #define HID_QUIRK_2WHEEL_MOUSE_HACK_ON          0x200
+#define HID_QUIRK_2WHEEL_POWERMOUSE             0x400
 
 /*
  * This is the global environment of the parser. This information is
@@ -348,7 +352,8 @@ struct hid_report_enum {
 
 #define HID_REPORT_TYPES 3
 
-#define HID_BUFFER_SIZE         64              /* use 64 for compatibility with all possible packetlen */
+#define HID_MIN_BUFFER_SIZE     64              /* make sure there is at least a packet size of space */
+#define HID_MAX_BUFFER_SIZE     4096            /* 4kb */
 #define HID_CONTROL_FIFO_SIZE   256             /* to init devices with >100 reports */
 #define HID_OUTPUT_FIFO_SIZE    64
 
@@ -386,6 +391,8 @@ struct hid_device {							/* device report descriptor */
 
         unsigned long iofl;                                             /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */
 
+        unsigned int bufsize;                                           /* URB buffer size */
+
         struct urb *urbin;                                              /* Input URB */
         char *inbuf;                                                    /* Input buffer */
         dma_addr_t inbuf_dma;                                           /* Input buffer dma */
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 4c13331b5f41..d32427818af7 100644
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -507,6 +507,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                         return -EINVAL;
 
                 hid_submit_report(hid, report, USB_DIR_OUT);
+                hid_wait_io(hid);
 
                 return 0;