Skip to content

Commit a364303

Browse files
jwrdegoedeBenjamin Tissoires
authored andcommitted
HID: logitech-hidpp: Remove wtp_get_config() call from probe()
For WTP devices which start disconnected (paired with the unifying receiver, but not connected atm) hidpp_connect_event() takes care of calling wtp_get_config() when the device later connects. There is no need to have a separate code path for WTP devices which are connected at probe() time, these can use the same code-path since probe() will queue hidpp_connect_event() for those at probe time. Drop the unnecessary wtp_get_config() call from probe(). 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 ba9de35 commit a364303

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/hid/hid-logitech-hidpp.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4499,11 +4499,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
44994499
hidpp_overwrite_name(hdev);
45004500
}
45014501

4502-
if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP)) {
4503-
ret = wtp_get_config(hidpp);
4504-
if (ret)
4505-
goto hid_hw_init_fail;
4506-
} else if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_G920)) {
4502+
if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_G920)) {
45074503
ret = g920_get_config(hidpp, &data);
45084504
if (ret)
45094505
goto hid_hw_init_fail;

0 commit comments

Comments
 (0)