Commit 28023d2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID updates from Jiri Kosina:

 - bounds checking fixes in logitech and roccat drivers, from Peter Wu
   and Dan Carpenter

 - double-kfree fix in i2c-hid driver on bus shutdown, from Mika
   Westerberg

 - a couple of various small driver fixes

 - a few device id additions

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: roccat: potential out of bounds in pyra_sysfs_write_settings()
  HID: Add a new id 0x501a for Genius MousePen i608X
  HID: logitech-hidpp: prefix the name with "Logitech"
  HID: logitech-hidpp: avoid unintended fall-through
  HID: Allow HID_BATTERY_STRENGTH to be enabled
  HID: i2c-hid: Do not free buffers in i2c_hid_stop()
  HID: add battery quirk for USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO keyboard
  HID: logitech-hidpp: check WTP report length
  HID: logitech-dj: check report length
parents 1dd34daa 606185b2

drivers/hid/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ if HID 


config HID_BATTERY_STRENGTH

	bool "Battery level reporting for HID devices"

	depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY

	depends on HID

	select POWER_SUPPLY

	default n

	---help---

	This option adds support of reporting battery strength (for HID devices

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1805,6 +1805,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ 
#define USB_DEVICE_ID_KYE_GPEN_560	0x5003

#define USB_DEVICE_ID_KYE_EASYPEN_I405X	0x5010

#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X	0x5011

#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2	0x501a

#define USB_DEVICE_ID_KYE_EASYPEN_M610X	0x5013



#define USB_VENDOR_ID_LABTEC		0x1020

drivers/hid/hid-input.c

+3 −0
Original line number Diff line number Diff line
@@ -311,6 +311,9 @@ static const struct hid_device_id hid_battery_quirks[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,

			       USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),

	  HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,

			       USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),

	  HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,

		USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),

	  HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },

drivers/hid/hid-kye.c

+4 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
		}

		break;

	case USB_DEVICE_ID_KYE_MOUSEPEN_I608X:

	case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2:

		if (*rsize == MOUSEPEN_I608X_RDESC_ORIG_SIZE) {

			rdesc = mousepen_i608x_rdesc_fixed;

			*rsize = sizeof(mousepen_i608x_rdesc_fixed);
@@ -415,6 +416,7 @@ static int kye_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	switch (id->product) {

	case USB_DEVICE_ID_KYE_EASYPEN_I405X:

	case USB_DEVICE_ID_KYE_MOUSEPEN_I608X:

	case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2:

	case USB_DEVICE_ID_KYE_EASYPEN_M610X:

		ret = kye_tablet_enable(hdev);

		if (ret) {
@@ -445,6 +447,8 @@ static const struct hid_device_id kye_devices[] = { 
				USB_DEVICE_ID_KYE_EASYPEN_I405X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

				USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

				USB_DEVICE_ID_KYE_MOUSEPEN_I608X_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

				USB_DEVICE_ID_KYE_EASYPEN_M610X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE