Merge branch 'for-4.7/upstream' into for-linus

Conflicts:
	drivers/hid/usbhid/hid-quirks.c

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 875ff6e..8ea3a26 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1129,49 +1129,46 @@ EXPORT_SYMBOL_GPL(hid_field_extract);
 static void __implement(u8 *report, unsigned offset, int n, u32 value)
 {
        unsigned int idx = offset / 8;
-       unsigned int size = offset + n;
        unsigned int bit_shift = offset % 8;
        int bits_to_set = 8 - bit_shift;
-       u8 bit_mask = 0xff << bit_shift;
 
        while (n - bits_to_set >= 0) {
-               report[idx] &= ~bit_mask;
+               report[idx] &= ~(0xff << bit_shift);
                report[idx] |= value << bit_shift;
                value >>= bits_to_set;
                n -= bits_to_set;
                bits_to_set = 8;
-               bit_mask = 0xff;
                bit_shift = 0;
                idx++;
        }
 
        /* last nibble */
        if (n) {
-               if (size % 8)
-                       bit_mask &= (1U << (size % 8)) - 1;
-               report[idx] &= ~bit_mask;
-               report[idx] |= (value << bit_shift) & bit_mask;
+               u8 bit_mask = ((1U << n) - 1);
+               report[idx] &= ~(bit_mask << bit_shift);
+               report[idx] |= value << bit_shift;
        }
 }
 
 static void implement(const struct hid_device *hid, u8 *report,
                      unsigned offset, unsigned n, u32 value)
 {
-       u64 m;
-
-       if (n > 32) {
+       if (unlikely(n > 32)) {
                hid_warn(hid, "%s() called with n (%d) > 32! (%s)\n",
                         __func__, n, current->comm);
                n = 32;
+       } else if (n < 32) {
+               u32 m = (1U << n) - 1;
+
+               if (unlikely(value > m)) {
+                       hid_warn(hid,
+                                "%s() called with too large value %d (n: %d)! (%s)\n",
+                                __func__, value, n, current->comm);
+                       WARN_ON(1);
+                       value &= m;
+               }
        }
 
-       m = (1ULL << n) - 1;
-       if (value > m)
-               hid_warn(hid, "%s() called with too large value %d! (%s)\n",
-                        __func__, value, current->comm);
-       WARN_ON(value > m);
-       value &= m;
-
        __implement(report, offset, n, value);
 }
 

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e550a3a..3eec09a 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -259,6 +259,13 @@
 #define USB_VENDOR_ID_CORSAIR          0x1b1c
 #define USB_DEVICE_ID_CORSAIR_K90      0x1b02
 
+#define USB_VENDOR_ID_CORSAIR           0x1b1c
+#define USB_DEVICE_ID_CORSAIR_K70R      0x1b09
+#define USB_DEVICE_ID_CORSAIR_K95RGB    0x1b11
+#define USB_DEVICE_ID_CORSAIR_M65RGB    0x1b12
+#define USB_DEVICE_ID_CORSAIR_K70RGB    0x1b13
+#define USB_DEVICE_ID_CORSAIR_K65RGB    0x1b17
+
 #define USB_VENDOR_ID_CREATIVELABS     0x041e
 #define USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51     0x322c
 #define USB_DEVICE_ID_PRODIKEYS_PCMIDI 0x2801

diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c
index 65c4ccf..76d06cf 100644 (file)
--- a/drivers/hid/hid-roccat.c
+++ b/drivers/hid/hid-roccat.c
@@ -421,14 +421,13 @@ static int __init roccat_init(void)
 
        retval = alloc_chrdev_region(&dev_id, ROCCAT_FIRST_MINOR,
                        ROCCAT_MAX_DEVICES, "roccat");
-
-       roccat_major = MAJOR(dev_id);
-
        if (retval < 0) {
                pr_warn("can't get major number\n");
                goto error;
        }
 
+       roccat_major = MAJOR(dev_id);
+
        cdev_init(&roccat_cdev, &roccat_ops);
        retval = cdev_add(&roccat_cdev, dev_id, ROCCAT_MAX_DEVICES);
 

diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index b9a76e3..f0e2757 100644 (file)
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -582,14 +582,13 @@ int __init hidraw_init(void)
 
        result = alloc_chrdev_region(&dev_id, HIDRAW_FIRST_MINOR,
                        HIDRAW_MAX_DEVICES, "hidraw");
-
-       hidraw_major = MAJOR(dev_id);
-
        if (result < 0) {
                pr_warn("can't get major number\n");
                goto out;
        }
 
+       hidraw_major = MAJOR(dev_id);
+
        hidraw_class = class_create(THIS_MODULE, "hidraw");
        if (IS_ERR(hidraw_class)) {
                result = PTR_ERR(hidraw_class);

diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 53fc856..b4b8c6a 100644 (file)
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -71,6 +71,11 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70R, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_M65RGB, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K95RGB, HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70RGB, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },