Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 187f2bba authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: logitech-hidpp: retrieve the HID++ device name when available 



hidpp->name can't be null.
Only HID++ 2.0 and above device supports the query.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 843c624e

drivers/hid/hid-logitech-hidpp.c

+7 −7
Original line number Diff line number Diff line
@@ -2443,13 +2443,7 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) 
			 hidpp->protocol_major, hidpp->protocol_minor);

	}



	hidpp_initialize_battery(hidpp);



	if (!(hidpp->quirks & HIDPP_QUIRK_NO_HIDINPUT))

		/* if HID created the input nodes for us, we can stop now */

		return;



	if (!hidpp->name || hidpp->name == hdev->name) {

	if (hidpp->name == hdev->name && hidpp->protocol_major >= 2) {

		name = hidpp_get_device_name(hidpp);

		if (!name) {

			hid_err(hdev,
@@ -2465,6 +2459,12 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) 
		hidpp->name = devm_name;

	}



	hidpp_initialize_battery(hidpp);



	if (!(hidpp->quirks & HIDPP_QUIRK_NO_HIDINPUT))

		/* if HID created the input nodes for us, we can stop now */

		return;



	input = hidpp_allocate_input(hdev);

	if (!input) {

		hid_err(hdev, "cannot allocate new input device: %d\n", ret);