Skip to content

Commit 219ccfb

Browse files
jwrdegoedeBenjamin Tissoires
authored andcommitted
HID: logitech-hidpp: Move g920_get_config() to just before hidpp_ff_init()
The data retrieved by g920_get_config() is only used by hidpp_ff_init(). Now that the hw is kept open till the end of probe() the g920_get_config() call can be moved to just before hidpp_ff_init() to have all the HIDPP_QUIRK_CLASS_G920 together in a single place. 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 a364303 commit 219ccfb

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

drivers/hid/hid-logitech-hidpp.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4399,7 +4399,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
43994399
int ret;
44004400
bool connected;
44014401
unsigned int connect_mask = HID_CONNECT_DEFAULT;
4402-
struct hidpp_ff_private_data data;
44034402

44044403
/* report_fixup needs drvdata to be set before we call hid_parse */
44054404
hidpp = devm_kzalloc(&hdev->dev, sizeof(*hidpp), GFP_KERNEL);
@@ -4499,12 +4498,6 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
44994498
hidpp_overwrite_name(hdev);
45004499
}
45014500

4502-
if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_G920)) {
4503-
ret = g920_get_config(hidpp, &data);
4504-
if (ret)
4505-
goto hid_hw_init_fail;
4506-
}
4507-
45084501
schedule_work(&hidpp->work);
45094502
flush_work(&hidpp->work);
45104503

@@ -4519,7 +4512,12 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
45194512
}
45204513

45214514
if (hidpp->quirks & HIDPP_QUIRK_CLASS_G920) {
4522-
ret = hidpp_ff_init(hidpp, &data);
4515+
struct hidpp_ff_private_data data;
4516+
4517+
ret = g920_get_config(hidpp, &data);
4518+
if (!ret)
4519+
ret = hidpp_ff_init(hidpp, &data);
4520+
45234521
if (ret)
45244522
hid_warn(hidpp->hid_dev,
45254523
"Unable to initialize force feedback support, errno %d\n",

0 commit comments

Comments
 (0)