]> git.itanic.dy.fi Git - linux-stable/commitdiff
HID: logitech-hidpp: Remove connected check for non-unifying devices
authorHans de Goede <hdegoede@redhat.com>
Tue, 10 Oct 2023 10:20:25 +0000 (12:20 +0200)
committerBenjamin Tissoires <bentiss@kernel.org>
Wed, 25 Oct 2023 16:41:15 +0000 (18:41 +0200)
Non-unifying devices (USB, Bluetooth) are always connected during
probe(), remove the unnecessary connected check.

This is a preparation patch for moving all connected state handling
to hidpp_connect_event().

This series has been tested on the following devices:
Logitech Bluetooth Laser Travel Mouse (bluetooth, HID++ 1.0)
Logitech M720 Triathlon (bluetooth, HID++ 4.5)
Logitech M720 Triathlon (unifying, HID++ 4.5)
Logitech K400 Pro (unifying, HID++ 4.1)
Logitech K270 (eQUAD nano Lite, HID++ 2.0)
Logitech M185 (eQUAD nano Lite, HID++ 4.5)
Logitech LX501 keyboard (27 Mhz, HID++ builtin scroll-wheel, HID++ 1.0)
Logitech M-RAZ105 mouse (27 Mhz, HID++ extra mouse buttons, HID++ 1.0)

And by bentiss:
Logitech Touchpad T650 (unifying)
Logitech Touchpad T651 (bluetooth)
Logitech MX Master 3B (BLE)
Logitech G403 (plain USB / Gaming receiver)

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20231010102029.111003-9-hdegoede@redhat.com
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
drivers/hid/hid-logitech-hidpp.c

index 55fc80f3be057a793d8c806ceefbe80d4403b259..21f41c147f9bc7b80bce8a2c73a9830e0440ff64 100644 (file)
@@ -4487,13 +4487,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
        connected = hidpp_root_get_protocol_version(hidpp) == 0;
        atomic_set(&hidpp->connected, connected);
-       if (!(hidpp->quirks & HIDPP_QUIRK_UNIFYING)) {
-               if (!connected) {
-                       ret = -ENODEV;
-                       hid_err(hdev, "Device not connected");
-                       goto hid_hw_init_fail;
-               }
-       }
 
        schedule_work(&hidpp->work);
        flush_work(&hidpp->work);