Commit 5e335542 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 fixes from Jiri Kosina:

 - functional regression fix for sensor-hub driver from Hans de Goede

 - stop doing device reset for i2c-hid devices, which unbreaks some of
   them (and is in line with the specification), from Kai-Heng Feng

 - error handling fix for hid-core from Gustavo A. R. Silva

 - functional regression fix for some Elan panels from Benjamin
   Tissoires

 - a few new device ID additions and misc small fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: i2c-hid: Don't reset device upon system resume
  HID: sensor-hub: Restore fixup for Lenovo ThinkPad Helix 2 sensor hub report
  HID: core: fix NULL pointer dereference
  HID: core: fix grouping by application
  HID: multitouch: fix Elan panels with 2 input modes declaration
  HID: hid-saitek: Add device ID for RAT 7 Contagion
  HID: core: fix memory leak on probe
  HID: input: fix leaking custom input node name
  HID: add support for Apple Magic Keyboards
  HID: i2c-hid: Fix flooded incomplete report after S3 on Rayd touchscreen
  HID: intel-ish-hid: Enable Sunrise Point-H ish driver
parents 28a0ea77 52cf93e6

drivers/hid/hid-apple.c

+8 −1
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
		struct hid_field *field, struct hid_usage *usage,

		unsigned long **bit, int *max)

{

	if (usage->hid == (HID_UP_CUSTOM | 0x0003)) {

	if (usage->hid == (HID_UP_CUSTOM | 0x0003) ||

			usage->hid == (HID_UP_MSVENDOR | 0x0003)) {

		/* The fn key on Apple USB keyboards */

		set_bit(EV_REP, hi->input->evbit);

		hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN);
@@ -472,6 +473,12 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),

drivers/hid/hid-core.c

+4 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ int hid_open_report(struct hid_device *device) 
	parser = vzalloc(sizeof(struct hid_parser));

	if (!parser) {

		ret = -ENOMEM;

		goto err;

		goto alloc_err;

	}



	parser->device = device;
@@ -1039,6 +1039,7 @@ int hid_open_report(struct hid_device *device) 
				hid_err(device, "unbalanced delimiter at end of report description\n");

				goto err;

			}

			kfree(parser->collection_stack);

			vfree(parser);

			device->status |= HID_STAT_PARSED;

			return 0;
@@ -1047,6 +1048,8 @@ int hid_open_report(struct hid_device *device) 


	hid_err(device, "item fetching failed at offset %d\n", (int)(end - start));

err:

	kfree(parser->collection_stack);

alloc_err:

	vfree(parser);

	hid_close_report(device);

	return ret;

drivers/hid/hid-ids.h

+3 −3
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#define USB_DEVICE_ID_ANTON_TOUCH_PAD	0x3101



#define USB_VENDOR_ID_APPLE		0x05ac

#define BT_VENDOR_ID_APPLE		0x004c

#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE	0x0304

#define USB_DEVICE_ID_APPLE_MAGICMOUSE	0x030d

#define USB_DEVICE_ID_APPLE_MAGICTRACKPAD	0x030e
@@ -157,6 +158,7 @@ 
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI   0x0267

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI   0x026c

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291

#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292
@@ -528,9 +530,6 @@ 
#define I2C_VENDOR_ID_HANTICK		0x0911

#define I2C_PRODUCT_ID_HANTICK_5288	0x5288



#define I2C_VENDOR_ID_RAYD		0x2386

#define I2C_PRODUCT_ID_RAYD_3118	0x3118



#define USB_VENDOR_ID_HANWANG		0x0b57

#define USB_DEVICE_ID_HANWANG_TABLET_FIRST	0x5000

#define USB_DEVICE_ID_HANWANG_TABLET_LAST	0x8fff
@@ -950,6 +949,7 @@ 
#define USB_DEVICE_ID_SAITEK_RUMBLEPAD	0xff17

#define USB_DEVICE_ID_SAITEK_PS1000	0x0621

#define USB_DEVICE_ID_SAITEK_RAT7_OLD	0x0ccb

#define USB_DEVICE_ID_SAITEK_RAT7_CONTAGION	0x0ccd

#define USB_DEVICE_ID_SAITEK_RAT7	0x0cd7

#define USB_DEVICE_ID_SAITEK_RAT9	0x0cfa

#define USB_DEVICE_ID_SAITEK_MMO7	0x0cd0

drivers/hid/hid-input.c

+3 −2
Original line number Diff line number Diff line
@@ -1582,6 +1582,7 @@ static struct hid_input *hidinput_allocate(struct hid_device *hid, 
	input_dev->dev.parent = &hid->dev;



	hidinput->input = input_dev;

	hidinput->application = application;

	list_add_tail(&hidinput->list, &hid->inputs);



	INIT_LIST_HEAD(&hidinput->reports);
@@ -1677,8 +1678,7 @@ static struct hid_input *hidinput_match_application(struct hid_report *report) 
	struct hid_input *hidinput;



	list_for_each_entry(hidinput, &hid->inputs, list) {

		if (hidinput->report &&

		    hidinput->report->application == report->application)

		if (hidinput->application == report->application)

			return hidinput;

	}
@@ -1815,6 +1815,7 @@ void hidinput_disconnect(struct hid_device *hid) 
			input_unregister_device(hidinput->input);

		else

			input_free_device(hidinput->input);

		kfree(hidinput->name);

		kfree(hidinput);

	}

drivers/hid/hid-multitouch.c

+17 −2
Original line number Diff line number Diff line
@@ -1375,7 +1375,8 @@ static bool mt_need_to_apply_feature(struct hid_device *hdev, 
				     struct hid_usage *usage,

				     enum latency_mode latency,

				     bool surface_switch,

				     bool button_switch)

				     bool button_switch,

				     bool *inputmode_found)

{

	struct mt_device *td = hid_get_drvdata(hdev);

	struct mt_class *cls = &td->mtclass;
@@ -1387,6 +1388,14 @@ static bool mt_need_to_apply_feature(struct hid_device *hdev, 


	switch (usage->hid) {

	case HID_DG_INPUTMODE:

		/*

		 * Some elan panels wrongly declare 2 input mode features,

		 * and silently ignore when we set the value in the second

		 * field. Skip the second feature and hope for the best.

		 */

		if (*inputmode_found)

			return false;



		if (cls->quirks & MT_QUIRK_FORCE_GET_FEATURE) {

			report_len = hid_report_len(report);

			buf = hid_alloc_report_buf(report, GFP_KERNEL);
@@ -1402,6 +1411,7 @@ static bool mt_need_to_apply_feature(struct hid_device *hdev, 
		}



		field->value[index] = td->inputmode_value;

		*inputmode_found = true;

		return true;



	case HID_DG_CONTACTMAX:
@@ -1439,6 +1449,7 @@ static void mt_set_modes(struct hid_device *hdev, enum latency_mode latency, 
	struct hid_usage *usage;

	int i, j;

	bool update_report;

	bool inputmode_found = false;



	rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];

	list_for_each_entry(rep, &rep_enum->report_list, list) {
@@ -1457,7 +1468,8 @@ static void mt_set_modes(struct hid_device *hdev, enum latency_mode latency, 
							     usage,

							     latency,

							     surface_switch,

							     button_switch))

							     button_switch,

							     &inputmode_found))

					update_report = true;

			}

		}
@@ -1685,6 +1697,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	 */

	hdev->quirks |= HID_QUIRK_INPUT_PER_APP;



	if (id->group != HID_GROUP_MULTITOUCH_WIN_8)

		hdev->quirks |= HID_QUIRK_MULTI_INPUT;



	timer_setup(&td->release_timer, mt_expired_timeout, 0);



	ret = hid_parse(hdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE