Commit 0365fb6b 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++ device support regression fixes (race condition during cleanup,
   device detection fix, opps fix) from Andrey Smirnov

 - disable PM on i2c-hid, as it's causing problems with a lot of
   devices; other OSes apparently don't implement/enable it either; from
   Kai-Heng Feng

 - error handling fix in intel-ish driver, from Zhang Lixu

 - syzbot fuzzer fix for HID core code from Alan Stern

 - a few other tiny fixups (printk message cleanup, new device ID)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: i2c-hid: add Trekstor Primebook C11B to descriptor override
  HID: logitech-hidpp: do all FF cleanup in hidpp_ff_destroy()
  HID: logitech-hidpp: rework device validation
  HID: logitech-hidpp: split g920_get_config()
  HID: i2c-hid: Remove runtime power management
  HID: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring()
  HID: google: add magnemite/masterball USB ids
  HID: Fix assumption that devices have inputs
  HID: prodikeys: make array keys static const, makes object smaller
  HID: fix error message in hid_open_report()
parents 9e5eefba 09f3dbe4

drivers/hid/hid-axff.c

+9 −2
Original line number Diff line number Diff line
@@ -63,13 +63,20 @@ static int axff_init(struct hid_device *hid) 
{

	struct axff_device *axff;

	struct hid_report *report;

	struct hid_input *hidinput = list_first_entry(&hid->inputs, struct hid_input, list);

	struct hid_input *hidinput;

	struct list_head *report_list =&hid->report_enum[HID_OUTPUT_REPORT].report_list;

	struct input_dev *dev = hidinput->input;

	struct input_dev *dev;

	int field_count = 0;

	int i, j;

	int error;



	if (list_empty(&hid->inputs)) {

		hid_err(hid, "no inputs found\n");

		return -ENODEV;

	}

	hidinput = list_first_entry(&hid->inputs, struct hid_input, list);

	dev = hidinput->input;



	if (list_empty(report_list)) {

		hid_err(hid, "no output reports found\n");

		return -ENODEV;

drivers/hid/hid-core.c

+5 −2
Original line number Diff line number Diff line
@@ -1139,6 +1139,7 @@ int hid_open_report(struct hid_device *device) 
	__u8 *start;

	__u8 *buf;

	__u8 *end;

	__u8 *next;

	int ret;

	static int (*dispatch_type[])(struct hid_parser *parser,

				      struct hid_item *item) = {
@@ -1192,7 +1193,8 @@ int hid_open_report(struct hid_device *device) 
	device->collection_size = HID_DEFAULT_NUM_COLLECTIONS;



	ret = -EINVAL;

	while ((start = fetch_item(start, end, &item)) != NULL) {

	while ((next = fetch_item(start, end, &item)) != NULL) {

		start = next;



		if (item.format != HID_ITEM_FORMAT_SHORT) {

			hid_err(device, "unexpected long global item\n");
@@ -1230,7 +1232,8 @@ int hid_open_report(struct hid_device *device) 
		}

	}



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

	hid_err(device, "item fetching failed at offset %u/%u\n",

		size - (unsigned int)(end - start), size);

err:

	kfree(parser->collection_stack);

alloc_err:

drivers/hid/hid-dr.c

+9 −3
Original line number Diff line number Diff line
@@ -75,13 +75,19 @@ static int drff_init(struct hid_device *hid) 
{

	struct drff_device *drff;

	struct hid_report *report;

	struct hid_input *hidinput = list_first_entry(&hid->inputs,

						struct hid_input, list);

	struct hid_input *hidinput;

	struct list_head *report_list =

			&hid->report_enum[HID_OUTPUT_REPORT].report_list;

	struct input_dev *dev = hidinput->input;

	struct input_dev *dev;

	int error;



	if (list_empty(&hid->inputs)) {

		hid_err(hid, "no inputs found\n");

		return -ENODEV;

	}

	hidinput = list_first_entry(&hid->inputs, struct hid_input, list);

	dev = hidinput->input;



	if (list_empty(report_list)) {

		hid_err(hid, "no output reports found\n");

		return -ENODEV;

drivers/hid/hid-emsff.c

+9 −3
Original line number Diff line number Diff line
@@ -47,13 +47,19 @@ static int emsff_init(struct hid_device *hid) 
{

	struct emsff_device *emsff;

	struct hid_report *report;

	struct hid_input *hidinput = list_first_entry(&hid->inputs,

						struct hid_input, list);

	struct hid_input *hidinput;

	struct list_head *report_list =

			&hid->report_enum[HID_OUTPUT_REPORT].report_list;

	struct input_dev *dev = hidinput->input;

	struct input_dev *dev;

	int error;



	if (list_empty(&hid->inputs)) {

		hid_err(hid, "no inputs found\n");

		return -ENODEV;

	}

	hidinput = list_first_entry(&hid->inputs, struct hid_input, list);

	dev = hidinput->input;



	if (list_empty(report_list)) {

		hid_err(hid, "no output reports found\n");

		return -ENODEV;

drivers/hid/hid-gaff.c

+9 −3
Original line number Diff line number Diff line
@@ -64,14 +64,20 @@ static int gaff_init(struct hid_device *hid) 
{

	struct gaff_device *gaff;

	struct hid_report *report;

	struct hid_input *hidinput = list_entry(hid->inputs.next,

						struct hid_input, list);

	struct hid_input *hidinput;

	struct list_head *report_list =

			&hid->report_enum[HID_OUTPUT_REPORT].report_list;

	struct list_head *report_ptr = report_list;

	struct input_dev *dev = hidinput->input;

	struct input_dev *dev;

	int error;



	if (list_empty(&hid->inputs)) {

		hid_err(hid, "no inputs found\n");

		return -ENODEV;

	}

	hidinput = list_entry(hid->inputs.next, struct hid_input, list);

	dev = hidinput->input;



	if (list_empty(report_list)) {

		hid_err(hid, "no output reports found\n");

		return -ENODEV;

CRA Git | Maintained and supported by SUSTech CRA and CCSE