Commit ecb4d529 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Jiri Kosina:

 - hid.git is moving towards group maintainership (where group is myself
   and Benjamin Tissoires), therefore this pull request updates
   MAINTAINERS accordingly

 - fix for hid-asus config dependency from Arnd Bergmann

 - two device-specific quirks for i2c-hid from Julian Sax and Kai-Heng
   Feng

 - other few small assorted fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: fix up .raw_event() documentation
  HID: asus: fix build warning wiht CONFIG_ASUS_WMI disabled
  HID: i2c-hid: add Direkt-Tek DTLAPY133-1 to descriptor override
  HID: moving to group maintainership model
  HID: alps: allow incoming reports when only the trackstick is opened
  Revert "HID: add NOGET quirk for Eaton Ellipse MAX UPS"
  HID: i2c-hid: Add a small delay after sleep command for Raydium touchpanel
  HID: hiddev: fix potential Spectre v1
parents 8053e5b9 aa9b760c

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -6607,9 +6607,9 @@ F: arch/*/include/asm/suspend*.h 


HID CORE LAYER

M:	Jiri Kosina <jikos@kernel.org>

R:	Benjamin Tissoires <benjamin.tissoires@redhat.com>

M:	Benjamin Tissoires <benjamin.tissoires@redhat.com>

L:	linux-input@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git

S:	Maintained

F:	drivers/hid/

F:	include/linux/hid*
@@ -15436,9 +15436,9 @@ F: include/linux/usb/gadget* 


USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)

M:	Jiri Kosina <jikos@kernel.org>

R:	Benjamin Tissoires <benjamin.tissoires@redhat.com>

M:	Benjamin Tissoires <benjamin.tissoires@redhat.com>

L:	linux-usb@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git

S:	Maintained

F:	Documentation/hid/hiddev.txt

F:	drivers/hid/usbhid/

drivers/hid/hid-alps.c

+18 −0
Original line number Diff line number Diff line
@@ -660,6 +660,20 @@ exit: 
	return ret;

}



static int alps_sp_open(struct input_dev *dev)

{

	struct hid_device *hid = input_get_drvdata(dev);



	return hid_hw_open(hid);

}



static void alps_sp_close(struct input_dev *dev)

{

	struct hid_device *hid = input_get_drvdata(dev);



	hid_hw_close(hid);

}



static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)

{

	struct alps_dev *data = hid_get_drvdata(hdev);
@@ -733,6 +747,10 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) 
		input2->id.version = input->id.version;

		input2->dev.parent = input->dev.parent;



		input_set_drvdata(input2, hdev);

		input2->open = alps_sp_open;

		input2->close = alps_sp_close;



		__set_bit(EV_KEY, input2->evbit);

		data->sp_btn_cnt = (data->sp_btn_info & 0x0F);

		for (i = 0; i < data->sp_btn_cnt; i++)

drivers/hid/hid-asus.c

+3 −0
Original line number Diff line number Diff line
@@ -359,6 +359,9 @@ static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev) 
	u32 value;

	int ret;



	if (!IS_ENABLED(CONFIG_ASUS_WMI))

		return false;



	ret = asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS2,

				       ASUS_WMI_DEVID_KBD_BACKLIGHT, 0, &value);

	hid_dbg(hdev, "WMI backlight check: rc %d value %x", ret, value);

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -927,6 +927,9 @@ 
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3003		0x3003

#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008		0x3008



#define I2C_VENDOR_ID_RAYDIUM		0x2386

#define I2C_PRODUCT_ID_RAYDIUM_4B33	0x4b33



#define USB_VENDOR_ID_RAZER            0x1532

#define USB_DEVICE_ID_RAZER_BLADE_14   0x011D

drivers/hid/hid-quirks.c

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ static const struct hid_device_id hid_quirks[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C05A), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C06A), HID_QUIRK_ALWAYS_POLL },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MCS, USB_DEVICE_ID_MCS_GAMEPADBLOCK), HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS), HID_QUIRK_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), HID_QUIRK_NO_INIT_REPORTS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2), HID_QUIRK_NO_INIT_REPORTS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2), HID_QUIRK_NO_INIT_REPORTS },

CRA Git | Maintained and supported by SUSTech CRA and CCSE