Commit 2ddf07f3 authored by Hans de Goede's avatar Hans de Goede Committed by Benjamin Tissoires

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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 22bf6bde
...@@ -3160,18 +3160,15 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) ...@@ -3160,18 +3160,15 @@ static void hidpp_connect_event(struct hidpp_device *hidpp)
if (hidpp->name == hdev->name && hidpp->protocol_major >= 2) { if (hidpp->name == hdev->name && hidpp->protocol_major >= 2) {
name = hidpp_get_device_name(hidpp); name = hidpp_get_device_name(hidpp);
if (!name) { if (name) {
hid_err(hdev, devm_name = devm_kasprintf(&hdev->dev, GFP_KERNEL,
"unable to retrieve the name of the device"); "%s", name);
return; kfree(name);
} if (!devm_name)
return;
devm_name = devm_kasprintf(&hdev->dev, GFP_KERNEL, "%s", name);
kfree(name);
if (!devm_name)
return;
hidpp->name = devm_name; hidpp->name = devm_name;
}
} }
hidpp_initialize_battery(hidpp); hidpp_initialize_battery(hidpp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment