Merge remote-tracking branch 'hid/for-next'

diff --combined drivers/hid/Kconfig
index 7245b7f8767ff36a7df4596de8fea0ffb75c28a5,4135055d72031c8b11adabe025fada68b396c655..513a16cc6e18536e1e38e23bf2068b99bb65f197
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -171,6 -171,16 +171,16 @@@ config HID_CHICON
        ---help---
        Support for Chicony Tactical pad.
  
+ config HID_CORSAIR
+       tristate "Corsair devices"
+       depends on HID && USB && LEDS_CLASS
+       ---help---
+       Support for Corsair devices that are not fully compliant with the
+       HID standard.
+ 
+       Supported devices:
+       - Vengeance K90
+ 
  config HID_PRODIKEYS
        tristate "Prodikeys PC-MIDI Keyboard support"
        depends on HID && SND
@@@ -257,12 -267,6 +267,12 @@@ config HID_GEMBIR
        ---help---
        Support for Gembird JPD-DualForce 2.
  
 +config HID_GFRM
 +      tristate "Google Fiber TV Box remote control support"
 +      depends on HID
 +      ---help---
 +      Support for Google Fiber TV Box remote controls
 +
  config HID_HOLTEK
        tristate "Holtek HID devices"
        depends on USB_HID
@@@ -678,9 -682,8 +688,8 @@@ config HID_SAITE
  
        Supported devices:
        - PS1000 Dual Analog Pad
-       - R.A.T.9 Gaming Mouse
-       - R.A.T.7 Gaming Mouse
-       - M.M.O.7 Gaming Mouse
+       - Saitek R.A.T.7, R.A.T.9, M.M.O.7 Gaming Mice
+       - Mad Catz R.A.T.5, R.A.T.9 Gaming Mice
  
  config HID_SAMSUNG
        tristate "Samsung InfraRed remote control or keyboards"

diff --combined drivers/hid/Makefile
index 571d176d22dfd739373b41dbd62c9df4b256fa77,edaa0f264bdedc72d34da02301117824810ea604..00011fee08b98f80fb032244041a1e3e7c45cb44
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -29,6 -29,7 +29,7 @@@ obj-$(CONFIG_HID_BELKIN)      += hid-belkin.
  obj-$(CONFIG_HID_BETOP_FF)    += hid-betopff.o
  obj-$(CONFIG_HID_CHERRY)      += hid-cherry.o
  obj-$(CONFIG_HID_CHICONY)     += hid-chicony.o
+ obj-$(CONFIG_HID_CORSAIR)     += hid-corsair.o
  obj-$(CONFIG_HID_CP2112)      += hid-cp2112.o
  obj-$(CONFIG_HID_CYPRESS)     += hid-cypress.o
  obj-$(CONFIG_HID_DRAGONRISE)  += hid-dr.o
@@@ -37,7 -38,6 +38,7 @@@ obj-$(CONFIG_HID_ELECOM)      += hid-elecom.
  obj-$(CONFIG_HID_ELO)         += hid-elo.o
  obj-$(CONFIG_HID_EZKEY)               += hid-ezkey.o
  obj-$(CONFIG_HID_GEMBIRD)     += hid-gembird.o
 +obj-$(CONFIG_HID_GFRM)                += hid-gfrm.o
  obj-$(CONFIG_HID_GT683R)      += hid-gt683r.o
  obj-$(CONFIG_HID_GYRATION)    += hid-gyration.o
  obj-$(CONFIG_HID_HOLTEK)      += hid-holtek-kbd.o

diff --combined drivers/hid/hid-core.c
index 70a11ac3811926733826129674e292bc907202f1,73f51477d42d0c2b8025d3198a1a0b900fb7394a..efed99fd2103a93b0a064ce88832f2123e949571
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -725,6 -725,7 +725,7 @@@ static void hid_scan_collection(struct 
  
        if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
            (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 ||
+            hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 ||
             hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP ||
             hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 ||
             hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&
@@@ -1611,7 -1612,7 +1612,7 @@@ int hid_connect(struct hid_device *hdev
                "Multi-Axis Controller"
        };
        const char *type, *bus;
-       char buf[64];
+       char buf[64] = "";
        unsigned int i;
        int len;
        int ret;
@@@ -1678,6 -1679,9 +1679,9 @@@
        case BUS_BLUETOOTH:
                bus = "BLUETOOTH";
                break;
+       case BUS_I2C:
+               bus = "I2C";
+               break;
        default:
                bus = "<UNKNOWN>";
        }
@@@ -1828,6 -1832,7 +1832,7 @@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_ACER_SWITCH12) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K90) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_CP2112) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
@@@ -1928,6 -1933,7 +1933,7 @@@
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) },
@@@ -1981,6 -1987,7 +1987,7 @@@
        { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7_OLD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT5) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9) },
  #endif
        { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
@@@ -2293,8 -2300,6 +2300,8 @@@ static const struct hid_device_id hid_i
        { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) },
 +      { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0400) },
 +      { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0401) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },