Skip to content

Commit 6f335b4

Browse files
jwrdegoedeBenjamin Tissoires
authored andcommitted
HID: logitech-hidpp: Remove connected check for non-unifying devices
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Benjamin Tissoires <[email protected]>
1 parent c14f148 commit 6f335b4

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

drivers/hid/hid-logitech-hidpp.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4487,13 +4487,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
44874487

44884488
connected = hidpp_root_get_protocol_version(hidpp) == 0;
44894489
atomic_set(&hidpp->connected, connected);
4490-
if (!(hidpp->quirks & HIDPP_QUIRK_UNIFYING)) {
4491-
if (!connected) {
4492-
ret = -ENODEV;
4493-
hid_err(hdev, "Device not connected");
4494-
goto hid_hw_init_fail;
4495-
}
4496-
}
44974490

44984491
schedule_work(&hidpp->work);
44994492
flush_work(&hidpp->work);

0 commit comments

Comments
 (0)