Commit 498ba206 authored by Bastien Nocera's avatar Bastien Nocera Committed by Benjamin Tissoires
Browse files

HID: logitech-hidpp: Don't restart communication if not necessary 



Don't stop and restart communication with the device unless we need to
modify the connect flags used because of a device quirk.

Signed-off-by: default avatarBastien Nocera <hadess@hadess.net>
Link: https://lore.kernel.org/r/20230125121723.3122-1-hadess@hadess.net


Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 43551d9b

drivers/hid/hid-logitech-hidpp.c

+20 −12
Original line number Diff line number Diff line
@@ -4106,6 +4106,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	bool connected;

	unsigned int connect_mask = HID_CONNECT_DEFAULT;

	struct hidpp_ff_private_data data;

	bool will_restart = false;



	/* report_fixup needs drvdata to be set before we call hid_parse */

	hidpp = devm_kzalloc(&hdev->dev, sizeof(*hidpp), GFP_KERNEL);
@@ -4156,6 +4157,10 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
			return ret;

	}



	if (hidpp->quirks & HIDPP_QUIRK_DELAYED_INIT ||

	    hidpp->quirks & HIDPP_QUIRK_UNIFYING)

		will_restart = true;



	INIT_WORK(&hidpp->work, delayed_work_cb);

	mutex_init(&hidpp->send_mutex);

	init_waitqueue_head(&hidpp->wait);
@@ -4170,7 +4175,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	 * Plain USB connections need to actually call start and open

	 * on the transport driver to allow incoming data.

	 */

	ret = hid_hw_start(hdev, 0);

	ret = hid_hw_start(hdev, will_restart ? 0 : connect_mask);

	if (ret) {

		hid_err(hdev, "hw start failed\n");

		goto hid_hw_start_fail;
@@ -4207,6 +4212,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
			hidpp->wireless_feature_index = 0;

		else if (ret)

			goto hid_hw_init_fail;

		ret = 0;

	}



	if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP)) {
@@ -4221,6 +4227,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 


	hidpp_connect_event(hidpp);



	if (will_restart) {

		/* Reset the HID node state */

		hid_device_io_stop(hdev);

		hid_hw_close(hdev);
@@ -4235,6 +4242,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
			hid_err(hdev, "%s:hid_hw_start returned error\n", __func__);

			goto hid_hw_start_fail;

		}

	}



	if (hidpp->quirks & HIDPP_QUIRK_CLASS_G920) {

		ret = hidpp_ff_init(hidpp, &data);