summaryrefslogtreecommitdiff
path: root/goodix_brl_fwupdate.c
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2022-12-04 22:05:50 -0800
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2022-12-04 22:05:51 -0800
commit8f49356b15bc5704e62091c652bfbc62d38bd666 (patch)
tree8d4af756bddc7f575efd4193ebbce08dad1cc8d8 /goodix_brl_fwupdate.c
parent3b7d21d1c871c69226d96bf2bf12ffc31866f8a1 (diff)
parentf513b970e0473db577afe9bba02e2cd8327eb270 (diff)
downloadgoodix_touch-8f49356b15bc5704e62091c652bfbc62d38bd666.tar.gz
Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3
SBMerger: 478053055 Change-Id: Ia3eb84efa6534db0def8d653dc101dd699c99b28 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
Diffstat (limited to 'goodix_brl_fwupdate.c')
-rw-r--r--goodix_brl_fwupdate.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/goodix_brl_fwupdate.c b/goodix_brl_fwupdate.c
index 7f304ba..0fb81e6 100644
--- a/goodix_brl_fwupdate.c
+++ b/goodix_brl_fwupdate.c
@@ -265,6 +265,7 @@ struct fw_update_ctrl {
struct kobject *kobj;
};
static struct fw_update_ctrl goodix_fw_update_ctrl;
+static struct goodix_ic_config one_binary_cfg;
static int goodix_fw_update_reset(int delay)
{
@@ -404,6 +405,13 @@ static int goodix_parse_firmware(struct firmware_data *fw_data)
ts_debug("Subsystem flash_addr:%08X",
fw_summary->subsys[i].flash_addr);
ts_debug("Subsystem Ptr:%p", fw_summary->subsys[i].data);
+
+ if (fw_summary->subsys[i].type == CONFIG_DATA_TYPE) {
+ one_binary_cfg.len = fw_summary->subsys[i].size;
+ memcpy(one_binary_cfg.data, fw_summary->subsys[i].data,
+ one_binary_cfg.len);
+ goodix_fw_update_ctrl.ic_config = &one_binary_cfg;
+ }
}
if (fw_summary->chip_type == CHIP_TYPE_BRA &&