From 91536c5638fbee2975fc3079e25b42a42776f659 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 1 Sep 2021 12:32:01 +0100 Subject: [PATCH] logitech-hidpp: Add the Model ID instance ID before getting firmware versions This will allow us to create a device-radio child in the future. --- plugins/logitech-hidpp/fu-logitech-hidpp-device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/logitech-hidpp/fu-logitech-hidpp-device.c b/plugins/logitech-hidpp/fu-logitech-hidpp-device.c index 095a34de2..5ebff3111 100644 --- a/plugins/logitech-hidpp/fu-logitech-hidpp-device.c +++ b/plugins/logitech-hidpp/fu-logitech-hidpp-device.c @@ -742,6 +742,10 @@ fu_logitech_hidpp_device_setup(FuDevice *device, GError **error) } } + /* get the model ID, typically something like B3630000000000 */ + if (!fu_logitech_hidpp_device_fetch_model_id(self, error)) + return FALSE; + /* get the firmware information */ if (!fu_logitech_hidpp_device_fetch_firmware_info(self, error)) return FALSE; @@ -750,10 +754,6 @@ fu_logitech_hidpp_device_setup(FuDevice *device, GError **error) if (!fu_logitech_hidpp_device_fetch_battery_level(self, error)) return FALSE; - /* get the model ID, typically something like B3630000000000 */ - if (!fu_logitech_hidpp_device_fetch_model_id(self, error)) - return FALSE; - /* try using HID++2.0 */ idx = fu_logitech_hidpp_device_feature_get_idx(self, HIDPP_FEATURE_GET_DEVICE_NAME_TYPE); if (idx != 0x00) {