Commit 2ddf07f3 authored Apr 20, 2019 by Hans de Goede Committed by Benjamin Tissoires Apr 23, 2019

HID: logitech-hidpp: do not make failure to get the name fatal



With devices attached to a non-unifying 2.4GHz receiver we sometimes fail
to get the name. This is not a fatal error, we can just continue with the
original name.

So instead of bailing out, continue with battery-initialization when this
happens. This fixes the battery not getting registered when we fail to
get the name.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

parent 22bf6bde

drivers/hid/hid-logitech-hidpp.c

+8 −11

Original line number	Diff line number	Diff line
		@@ -3160,19 +3160,16 @@ static void hidpp_connect_event(struct hidpp_device *hidpp)

		if (hidpp->name == hdev->name && hidpp->protocol_major >= 2) {
		name = hidpp_get_device_name(hidpp);
		if (!name) {
		hid_err(hdev,
		"unable to retrieve the name of the device");
		return;
		}

		devm_name = devm_kasprintf(&hdev->dev, GFP_KERNEL, "%s", name);
		if (name) {
		devm_name = devm_kasprintf(&hdev->dev, GFP_KERNEL,
		"%s", name);
		kfree(name);
		if (!devm_name)
		return;

		hidpp->name = devm_name;
		}
		}

		hidpp_initialize_battery(hidpp);

Admin message