Commit 740bebf4 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:

 - fix for Intel-ISH driver to make sure it gets aoutoloaded only on
   matching devices and not universally (Thomas Weißschuh)

 - fix for Wacom driver reporting invalid contact under certain
   circumstances (Jason Gerecke)

 - probing fix for ft260 dirver (Michael Zaidman)

 - fix for generic keycode remapping (Thomas Weißschuh)

 - fix for division by zero in hid-magicmouse (Claudia Pellegrino)

 - other tiny assorted fixes and new device IDs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: multitouch: Fix Iiyama ProLite T1931SAW (0eef:0001 again!)
  HID: nintendo: eliminate dead datastructures in !CONFIG_NINTENDO_FF case
  HID: magicmouse: prevent division by 0 on scroll
  HID: thrustmaster: fix sparse warnings
  HID: Ignore battery for Elan touchscreen on HP Envy X360 15-eu0xxx
  HID: input: set usage type to key on keycode remap
  HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields
  HID: ft260: fix i2c probing for hwmon devices
  Revert "HID: hid-asus.c: Maps key 0x35 (display off) to KEY_SCREENLOCK"
  HID: intel-ish-hid: fix module device-id handling
  mod_devicetable: fix kdocs for ishtp_device_id
  HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts
  HID: nintendo: unlock on error in joycon_leds_create()
  platform/x86: isthp_eclite: only load for matching devices
  platform/chrome: chros_ec_ishtp: only load for matching devices
  HID: intel-ish-hid: hid-client: only load for matching devices
  HID: intel-ish-hid: fw-loader: only load for matching devices
  HID: intel-ish-hid: use constants for modaliases
  HID: intel-ish-hid: add support for MODULE_DEVICE_TABLE()
parents 5d9f4cf3 32bea357

drivers/hid/hid-asus.c

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ static int asus_input_mapping(struct hid_device *hdev, 
		switch (usage->hid & HID_USAGE) {

		case 0x10: asus_map_key_clear(KEY_BRIGHTNESSDOWN);	break;

		case 0x20: asus_map_key_clear(KEY_BRIGHTNESSUP);		break;

		case 0x35: asus_map_key_clear(KEY_SCREENLOCK);		break;

		case 0x35: asus_map_key_clear(KEY_DISPLAY_OFF);		break;

		case 0x6c: asus_map_key_clear(KEY_SLEEP);		break;

		case 0x7c: asus_map_key_clear(KEY_MICMUTE);		break;

		case 0x82: asus_map_key_clear(KEY_CAMERA);		break;

drivers/hid/hid-ft260.c

+5 −6
Original line number Diff line number Diff line
@@ -966,24 +966,23 @@ static int ft260_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	mutex_init(&dev->lock);

	init_completion(&dev->wait);



	ret = ft260_xfer_status(dev);

	if (ret)

		ft260_i2c_reset(hdev);



	i2c_set_adapdata(&dev->adap, dev);

	ret = i2c_add_adapter(&dev->adap);

	if (ret) {

		hid_err(hdev, "failed to add i2c adapter\n");

		goto err_hid_close;

	}



	i2c_set_adapdata(&dev->adap, dev);



	ret = sysfs_create_group(&hdev->dev.kobj, &ft260_attr_group);

	if (ret < 0) {

		hid_err(hdev, "failed to create sysfs attrs\n");

		goto err_i2c_free;

	}



	ret = ft260_xfer_status(dev);

	if (ret)

		ft260_i2c_reset(hdev);



	return 0;



err_i2c_free:

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ 
#define USB_DEVICE_ID_TOSHIBA_CLICK_L9W	0x0401

#define USB_DEVICE_ID_HP_X2		0x074d

#define USB_DEVICE_ID_HP_X2_10_COVER	0x0755

#define I2C_DEVICE_ID_HP_ENVY_X360_15	0x2d05

#define I2C_DEVICE_ID_HP_SPECTRE_X360_15	0x2817

#define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN	0x2706

#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN	0x261A

drivers/hid/hid-input.c

+5 −3
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static int hidinput_setkeycode(struct input_dev *dev, 
	if (usage) {

		*old_keycode = usage->type == EV_KEY ?

				usage->code : KEY_RESERVED;

		usage->type = EV_KEY;

		usage->code = ke->keycode;



		clear_bit(*old_keycode, dev->keybit);
@@ -324,6 +325,8 @@ static const struct hid_device_id hid_battery_quirks[] = { 
	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_15),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN),
@@ -650,10 +653,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
						code += KEY_MACRO1;

					else

						code += BTN_TRIGGER_HAPPY - 0x1e;

				} else {

					goto ignore;

				}

					break;

				}

				fallthrough;

		default:

			switch (field->physical) {

			case HID_GD_MOUSE:

drivers/hid/hid-magicmouse.c

+5 −2
Original line number Diff line number Diff line
@@ -256,8 +256,11 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda 
		unsigned long now = jiffies;

		int step_x = msc->touches[id].scroll_x - x;

		int step_y = msc->touches[id].scroll_y - y;

		int step_hr = ((64 - (int)scroll_speed) * msc->scroll_accel) /

			      SCROLL_HR_STEPS;

		int step_hr =

			max_t(int,

			      ((64 - (int)scroll_speed) * msc->scroll_accel) /

					SCROLL_HR_STEPS,

			      1);

		int step_x_hr = msc->touches[id].scroll_x_hr - x;

		int step_y_hr = msc->touches[id].scroll_y_hr - y;