diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2017-03-27 10:59:24 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-04-06 08:36:37 -0400 |
commit | b4f8ce07b55fa30b5a8c0d2655f1c5cc4c0b9095 (patch) | |
tree | 62eadc4d6d17954d12bba03ba50084f0a4f394ff | |
parent | 680de741e835d56e504997b613895058625291e9 (diff) |
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>
-rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) | |||
2309 | * Ask the receiver for its name. | 2309 | * Ask the receiver for its name. |
2310 | */ | 2310 | */ |
2311 | name = hidpp_get_unifying_name(hidpp); | 2311 | name = hidpp_get_unifying_name(hidpp); |
2312 | else if (hidpp->protocol_major < 2) | ||
2313 | return; | ||
2312 | else | 2314 | else |
2313 | name = hidpp_get_device_name(hidpp); | 2315 | name = hidpp_get_device_name(hidpp); |
2314 | 2316 | ||