Commit ba9de350 authored Oct 10, 2023 by Hans de Goede Committed by Benjamin Tissoires Oct 25, 2023

HID: logitech-hidpp: Move get_wireless_feature_index() check to hidpp_connect_event()



Calling get_wireless_feature_index() from probe() causes
the wireless_feature_index to only get set for unifying devices which
are already connected at probe() time. It does not get set for devices
which connect later.

Fix this by moving get_wireless_feature_index() to hidpp_connect_event(),
this does not make a difference for devices connected at probe() since
probe() will queue the hidpp_connect_event() for those at probe time.

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)

Fixes: 0da0a63b ("HID: logitech-hidpp: Support WirelessDeviceStatus connect events")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20231010102029.111003-4-hdegoede@redhat.com


Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>

parent 55bf7036

drivers/hid/hid-logitech-hidpp.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -1835,15 +1835,14 @@ static int hidpp_battery_get_property(struct power_supply *psy,
		/* -------------------------------------------------------------------------- */
		#define HIDPP_PAGE_WIRELESS_DEVICE_STATUS 0x1d4b

		static int hidpp_set_wireless_feature_index(struct hidpp_device *hidpp)
		static int hidpp_get_wireless_feature_index(struct hidpp_device hidpp, u8 feature_index)
		{
		u8 feature_type;
		int ret;

		ret = hidpp_root_get_feature(hidpp,
		HIDPP_PAGE_WIRELESS_DEVICE_STATUS,
		&hidpp->wireless_feature_index,
		&feature_type);
		feature_index, &feature_type);

		return ret;
		}
		@@ -4249,6 +4248,13 @@ static void hidpp_connect_event(struct hidpp_device *hidpp)
		}
		}

		if (hidpp->protocol_major >= 2) {
		u8 feature_index;

		if (!hidpp_get_wireless_feature_index(hidpp, &feature_index))
		hidpp->wireless_feature_index = feature_index;
		}

		if (hidpp->name == hdev->name && hidpp->protocol_major >= 2) {
		name = hidpp_get_device_name(hidpp);
		if (name) {
		@@ -4493,14 +4499,6 @@ static int hidpp_probe(struct hid_device hdev, const struct hid_device_id id)
		hidpp_overwrite_name(hdev);
		}

		if (connected && hidpp->protocol_major >= 2) {
		ret = hidpp_set_wireless_feature_index(hidpp);
		if (ret == -ENOENT)
		hidpp->wireless_feature_index = 0;
		else if (ret)
		goto hid_hw_init_fail;
		}

		if (connected && (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP)) {
		ret = wtp_get_config(hidpp);
		if (ret)