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

[ Upstream commit 498ba20690357691103de0f766960355247c78be ]

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: Bastien Nocera <hadess@hadess.net>
Link: https://lore.kernel.org/r/20230125121723.3122-1-hadess@hadess.net
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 81de88ab2ecc73d21b122a516c5b8716bda64006..601ab673727dc02e96e3cfc6dd2878b688ba2ecd 100644 (file)
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -4049,6 +4049,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);
@@ -4104,6 +4105,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);
@@ -4118,7 +4123,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;
@@ -4155,6 +4160,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)) {
@@ -4169,19 +4175,21 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
        hidpp_connect_event(hidpp);
 
-       /* Reset the HID node state */
-       hid_device_io_stop(hdev);
-       hid_hw_close(hdev);
-       hid_hw_stop(hdev);
+       if (will_restart) {
+               /* Reset the HID node state */
+               hid_device_io_stop(hdev);
+               hid_hw_close(hdev);
+               hid_hw_stop(hdev);
 
-       if (hidpp->quirks & HIDPP_QUIRK_NO_HIDINPUT)
-               connect_mask &= ~HID_CONNECT_HIDINPUT;
+               if (hidpp->quirks & HIDPP_QUIRK_NO_HIDINPUT)
+                       connect_mask &= ~HID_CONNECT_HIDINPUT;
 
-       /* Now export the actual inputs and hidraw nodes to the world */
-       ret = hid_hw_start(hdev, connect_mask);
-       if (ret) {
-               hid_err(hdev, "%s:hid_hw_start returned error\n", __func__);
-               goto hid_hw_start_fail;
+               /* Now export the actual inputs and hidraw nodes to the world */
+               ret = hid_hw_start(hdev, connect_mask);
+               if (ret) {
+                       hid_err(hdev, "%s:hid_hw_start returned error\n", __func__);
+                       goto hid_hw_start_fail;
+               }
        }
 
        if (hidpp->quirks & HIDPP_QUIRK_CLASS_G920) {