From 5ed675f93bceeedc5f6e2daca85f3d8ec60651d6 Mon Sep 17 00:00:00 2001 From: Josh Chen Date: Tue, 30 Aug 2022 10:01:29 +0800 Subject: [PATCH] elantp: fix missing initial value and remove duplicate code --- plugins/elantp/fu-elantp-hid-device.c | 3 +++ plugins/elantp/fu-elantp-i2c-device.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/elantp/fu-elantp-hid-device.c b/plugins/elantp/fu-elantp-hid-device.c index e8d3524a0..55630e011 100644 --- a/plugins/elantp/fu-elantp-hid-device.c +++ b/plugins/elantp/fu-elantp-hid-device.c @@ -477,6 +477,9 @@ fu_elantp_hid_device_detach(FuDevice *device, FuProgress *progress, GError **err } else { iap_ver = fu_memread_uint16(buf, G_LITTLE_ENDIAN); } + + /* set the page size */ + self->fw_page_size = 64; if (ic_type >= 0x10) { if (iap_ver >= 1) { /* set the IAP type, presumably some kind of ABI */ diff --git a/plugins/elantp/fu-elantp-i2c-device.c b/plugins/elantp/fu-elantp-i2c-device.c index a4b76d7de..04015cbd4 100644 --- a/plugins/elantp/fu-elantp-i2c-device.c +++ b/plugins/elantp/fu-elantp-i2c-device.c @@ -327,7 +327,6 @@ fu_elantp_i2c_device_setup(FuDevice *device, GError **error) G_LITTLE_ENDIAN, error)) return FALSE; - fu_device_add_instance_u16(device, "MOD", self->module_id); /* define the extra instance IDs */ fu_device_add_instance_u16(device, "VEN", vid);