Commit 3e6b0bb2 authored by Hans de Goede's avatar Hans de Goede Committed by Benjamin Tissoires
Browse files

HID: logitech-hidpp: Stop IO before calling hid_connect() 



hid_connect() will call hid_pidff_init() which does
hid_device_io_start() leading to an "io already started" warning.

To fix this call hid_device_io_stop() before calling hid_connect(),
stopping IO means that connect events may be lost while hid_connect()
runs, re-enable IO and move the hidpp_connect_event() work queuing
after the hid_connect().

Note re-enabling IO is also necessary for the g920_get_config()
call later during hidpp_probe().

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20231025190151.302376-1-hdegoede@redhat.com


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent 9ce363aa

drivers/hid/hid-logitech-hidpp.c

+6 −3
Original line number Diff line number Diff line
@@ -4461,19 +4461,22 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	else

		hidpp_non_unifying_init(hidpp);



	schedule_work(&hidpp->work);

	flush_work(&hidpp->work);



	if (hidpp->quirks & HIDPP_QUIRK_DELAYED_INIT)

		connect_mask &= ~HID_CONNECT_HIDINPUT;



	/* Now export the actual inputs and hidraw nodes to the world */

	hid_device_io_stop(hdev);

	ret = hid_connect(hdev, connect_mask);

	if (ret) {

		hid_err(hdev, "%s:hid_connect returned error %d\n", __func__, ret);

		goto hid_hw_init_fail;

	}



	/* Check for connected devices now that incoming packets will not be disabled again */

	hid_device_io_start(hdev);

	schedule_work(&hidpp->work);

	flush_work(&hidpp->work);



	if (hidpp->quirks & HIDPP_QUIRK_CLASS_G920) {

		struct hidpp_ff_private_data data;