From a0fd32f4187aef8dec662cbac57361778598d37a Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 16 Jul 2021 16:37:51 +0100 Subject: [PATCH] vli: Fix a regression when installing VL820Q7 firmware This regressed in c255034574c725583afac4a6c7eed901b8ac2d7f which caused ThinkPad Thunderbolt 3 Workstation Dock updates to fail. Fixes https://github.com/fwupd/fwupd/issues/3460 --- plugins/vli/fu-vli-usbhub-firmware.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/plugins/vli/fu-vli-usbhub-firmware.c b/plugins/vli/fu-vli-usbhub-firmware.c index 40c279c4d..8b91f97d8 100644 --- a/plugins/vli/fu-vli-usbhub-firmware.c +++ b/plugins/vli/fu-vli-usbhub-firmware.c @@ -182,15 +182,8 @@ fu_vli_usbhub_firmware_parse (FuFirmware *firmware, if (tmp == 0xF0) { self->device_kind = FU_VLI_DEVICE_KIND_VL822; } else { - /* Q7/Q8 requires searching two addresses for offset value */ - if (!fu_common_read_uint16_safe (buf, bufsz, 0x8018, - &adr_ofs,G_BIG_ENDIAN, error)) { - g_prefix_error (error, "failed to get Q7/Q8 offset mapping: "); - return FALSE; - } - if (!fu_common_read_uint8_safe (buf, bufsz, adr_ofs + 0x2000 + 0x05, - &tmp, error)) { - g_prefix_error (error, "failed to get offset version: "); + if (!fu_common_read_uint8_safe (buf, bufsz, 0xf000, &tmp, error)) { + g_prefix_error (error, "failed to get Q7/Q8 difference: "); return FALSE; } if (tmp & (1 << 0))