Commit 9c730fe1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Jiri Kosina:

 - fix for memory leak (on error path) in Hyper-V driver (Yang
   Yingliang)

 - regression fix for handling 3rd barrel switch emulation in Wacom
   driver (Jason Gerecke)

* tag 'for-linus-2022111101' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: wacom: Fix logic used for 3rd barrel switch emulation
  HID: hyperv: fix possible memory leak in mousevsc_probe()
  HID: asus: Remove unused variable in asus_report_tool_width()
parents 64b4aef1 f77810f7

drivers/hid/hid-asus.c

+1 −3
Original line number Diff line number Diff line
@@ -219,14 +219,13 @@ static void asus_report_tool_width(struct asus_drvdata *drvdat) 
{

	struct input_mt *mt = drvdat->input->mt;

	struct input_mt_slot *oldest;

	int oldid, count, i;

	int oldid, i;



	if (drvdat->tp->contact_size < 5)

		return;



	oldest = NULL;

	oldid = mt->trkid;

	count = 0;



	for (i = 0; i < mt->num_slots; ++i) {

		struct input_mt_slot *ps = &mt->slots[i];
@@ -238,7 +237,6 @@ static void asus_report_tool_width(struct asus_drvdata *drvdat) 
			oldest = ps;

			oldid = id;

		}

		count++;

	}



	if (oldest) {

drivers/hid/hid-hyperv.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static int mousevsc_probe(struct hv_device *device, 


	ret = hid_add_device(hid_dev);

	if (ret)

		goto probe_err1;

		goto probe_err2;





	ret = hid_parse(hid_dev);

drivers/hid/wacom_wac.c

+6 −5
Original line number Diff line number Diff line
@@ -2520,11 +2520,12 @@ static void wacom_wac_pen_report(struct hid_device *hdev, 


	if (!delay_pen_events(wacom_wac) && wacom_wac->tool[0]) {

		int id = wacom_wac->id[0];

		if (wacom_wac->features.quirks & WACOM_QUIRK_PEN_BUTTON3 &&

		    wacom_wac->hid_data.barrelswitch & wacom_wac->hid_data.barrelswitch2) {

			wacom_wac->hid_data.barrelswitch = 0;

			wacom_wac->hid_data.barrelswitch2 = 0;

			wacom_wac->hid_data.barrelswitch3 = 1;

		if (wacom_wac->features.quirks & WACOM_QUIRK_PEN_BUTTON3) {

			int sw_state = wacom_wac->hid_data.barrelswitch |

				       (wacom_wac->hid_data.barrelswitch2 << 1);

			wacom_wac->hid_data.barrelswitch = sw_state == 1;

			wacom_wac->hid_data.barrelswitch2 = sw_state == 2;

			wacom_wac->hid_data.barrelswitch3 = sw_state == 3;

		}

		input_report_key(input, BTN_STYLUS, wacom_wac->hid_data.barrelswitch);

		input_report_key(input, BTN_STYLUS2, wacom_wac->hid_data.barrelswitch2);