Commit 1c3e979b 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:

 - NULL pointer dereference fix in Vivaldi driver (Jiasheng Jiang)

 - regression fix for device probing in Holtek driver (Benjamin
   Tissoires)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: potential dereference of null pointer
  HID: holtek: fix mouse probing
parents 6e0567b7 13251ce1

drivers/hid/hid-holtek-mouse.c

+15 −0
Original line number Diff line number Diff line
@@ -65,8 +65,23 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
static int holtek_mouse_probe(struct hid_device *hdev,

			      const struct hid_device_id *id)

{

	int ret;



	if (!hid_is_usb(hdev))

		return -EINVAL;



	ret = hid_parse(hdev);

	if (ret) {

		hid_err(hdev, "hid parse failed: %d\n", ret);

		return ret;

	}



	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret) {

		hid_err(hdev, "hw start failed: %d\n", ret);

		return ret;

	}



	return 0;

}

drivers/hid/hid-vivaldi.c

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ static int vivaldi_probe(struct hid_device *hdev, 
	int ret;



	drvdata = devm_kzalloc(&hdev->dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;



	hid_set_drvdata(hdev, drvdata);



	ret = hid_parse(hdev);