From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 17 May 2016 10:41:22 +0000 (+0200)
Subject: Merge branch 'for-4.7/upstream' into for-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3390e579b3dac71e630ed879a73c5ac3b4447045;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

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

3390e579b3dac71e630ed879a73c5ac3b4447045
diff --cc drivers/hid/hid-ids.h
index e550a3a2b06d,fa5b1287c0ae..3eec09a134cb
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -259,8 -258,14 +259,15 @@@
  #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
  
  #define USB_VENDOR_ID_CVTOUCH		0x1ff7
diff --cc drivers/hid/usbhid/hid-quirks.c
index 53fc856d6867,0ffcaf9cbe81..b4b8c6abb03e
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@ -71,7 -71,11 +71,12 @@@ 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 },
  	{ USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },