From 5545cf6232364f80019338b9a5768a623642ddf8 Mon Sep 17 00:00:00 2001 From: Andy Chi Date: Fri, 20 May 2022 12:08:41 +0800 Subject: [PATCH 1/2] debian/patches/elanmoc-Adjustments-to-protocol-change-passing-an-empty-u.patch --- ...o-protocol-change-passing-an-empty-u.patch | 35 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 debian/patches/elanmoc-Adjustments-to-protocol-change-passing-an-empty-u.patch diff --git a/debian/patches/elanmoc-Adjustments-to-protocol-change-passing-an-empty-u.patch b/debian/patches/elanmoc-Adjustments-to-protocol-change-passing-an-empty-u.patch new file mode 100644 index 0000000..a26214e --- /dev/null +++ b/debian/patches/elanmoc-Adjustments-to-protocol-change-passing-an-empty-u.patch @@ -0,0 +1,35 @@ +From: hermanlin +Date: Tue, 10 Aug 2021 16:22:54 +0800 +Subject: elanmoc: Adjustments to protocol change (passing an empty user ID) + +--- + libfprint/drivers/elanmoc/elanmoc.c | 2 +- + libfprint/drivers/elanmoc/elanmoc.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfprint/drivers/elanmoc/elanmoc.c b/libfprint/drivers/elanmoc/elanmoc.c +index edbe4d1..d0dd6e8 100644 +--- a/libfprint/drivers/elanmoc/elanmoc.c ++++ b/libfprint/drivers/elanmoc/elanmoc.c +@@ -431,7 +431,7 @@ elan_enroll_run_state (FpiSsm *ssm, FpDevice *dev) + case MOC_ENROLL_REENROLL_CHECK: + data = fpi_ssm_get_data (ssm); + cmd_buf = elanmoc_compose_cmd (&elanmoc_check_reenroll_cmd); +- cmd_buf[4] = data[16]; ++ memcpy (cmd_buf + 3, data, ELAN_USERDATE_SIZE); + elanmoc_get_cmd (dev, cmd_buf, elanmoc_check_reenroll_cmd.cmd_len, elanmoc_check_reenroll_cmd.resp_len, 0, elanmoc_reenroll_cb); + break; + +diff --git a/libfprint/drivers/elanmoc/elanmoc.h b/libfprint/drivers/elanmoc/elanmoc.h +index 84eed7e..daf630e 100644 +--- a/libfprint/drivers/elanmoc/elanmoc.h ++++ b/libfprint/drivers/elanmoc/elanmoc.h +@@ -135,7 +135,7 @@ static const struct elanmoc_cmd elanmoc_set_mod_cmd = { + + static const struct elanmoc_cmd elanmoc_check_reenroll_cmd = { + .cmd_header = {0x40, 0xff, 0x22}, +- .cmd_len = 5, ++ .cmd_len = 3 + ELAN_USERDATE_SIZE, + .resp_len = 2, + }; + diff --git a/debian/patches/series b/debian/patches/series index 4e078dd..f212208 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -61,3 +61,4 @@ synaptics-add-new-PID-0x100-and-remove-PID-0xE7.patch synaptics-add-new-PID-0xF0-and-0x103.patch synaptics-add-new-PID-0x0123-0x0126-and-0x0129.patch elanmoc-Add-elanmoc-driver.patch +elanmoc-Adjustments-to-protocol-change-passing-an-empty-u.patch -- GitLab From ba12b991cf43028b584487e7dddd9f5b78758295 Mon Sep 17 00:00:00 2001 From: Andy Chi Date: Fri, 20 May 2022 04:24:49 +0000 Subject: [PATCH 2/2] Update changelog --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 69efee2..77da0f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +libfprint (1:1.90.2+tod1-0ubuntu1~20.04.8) UNRELEASED; urgency=medium + + [ Marco Trevisan (Treviño) ] + * debian/patches: Refresh + * debian/patches: Cherry-pick upstream elanmoc driver support for Elan's + Match on Chip devices (LP: #1936302). + + [ Andy Chi ] + * d/p/elanmoc-Adjustments-to-protocol-change-passing-an-empty-u.patch: + Cherry-pick upstream fixes for elanmoc driver (LP: #1936302) + + -- Andy Chi Fri, 20 May 2022 12:12:41 +0800 + libfprint (1:1.90.2+tod1-0ubuntu1~20.04.7) focal; urgency=medium * debian/patches: Add support for new synaptics ID. (LP: #1962277) -- GitLab