1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index db15cfc622c4..b0d2fea7ec56 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -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);