From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Date: Mon, 27 Mar 2017 14:59:24 +0000 (+0200)
Subject: HID: logitech-hidpp: do not query the name through HID++ for 1.0 devices
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b4f8ce07b55fa30b5a8c0d2655f1c5cc4c0b9095;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

HID: logitech-hidpp: do not query the name through HID++ for 1.0 devices

Unless they are connected through unifying, they don't support it,
so remove one error in the logs.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 1cda29ec0efd..4031405ac191 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -2309,6 +2309,8 @@ static void hidpp_overwrite_name(struct hid_device *hdev, bool use_unifying)
 		 * Ask the receiver for its name.
 		 */
 		name = hidpp_get_unifying_name(hidpp);
+	else if (hidpp->protocol_major < 2)
+		return;
 	else
 		name = hidpp_get_device_name(hidpp);