From 0eee6a56ddd14a22c86e222f9de6594fba3b6a82 Mon Sep 17 00:00:00 2001 From: Vincent Huang Date: Mon, 30 Nov 2020 13:53:07 +0800 Subject: [PATCH 1/6] synaptics: add support to sensor PID 0xC9 --- libfprint/drivers/synaptics/synaptics.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c index 9702f8a8..5d824a6c 100644 --- a/libfprint/drivers/synaptics/synaptics.c +++ b/libfprint/drivers/synaptics/synaptics.c @@ -34,6 +34,7 @@ static const FpIdEntry id_table[] = { { .vid = SYNAPTICS_VENDOR_ID, .pid = 0xF9, }, { .vid = SYNAPTICS_VENDOR_ID, .pid = 0xFC, }, { .vid = SYNAPTICS_VENDOR_ID, .pid = 0xC2, }, + { .vid = SYNAPTICS_VENDOR_ID, .pid = 0xC9, }, { .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */ }; From 2b7cfa751accab0eabda42a55c801eb252e95964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 30 Nov 2020 20:03:32 +0100 Subject: [PATCH 2/6] list-udev-rules: Remove Wrongly added well-known USB controller vid/pid combo This was causing USB controllers to use power-saving mode, breaking usb devices usage. Related to: https://gitlab.freedesktop.org/libfprint/libfprint/-/issues/327 --- libfprint/fprint-list-udev-rules.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c index 71fbf36f..d6c884cb 100644 --- a/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c @@ -75,7 +75,6 @@ static const FpIdEntry whitelist_id_table[] = { { .vid = 0x1c7a, .pid = 0x0300 }, { .vid = 0x1c7a, .pid = 0x0570 }, { .vid = 0x1c7a, .pid = 0x0575 }, - { .vid = 0x1d6b, .pid = 0x0002 }, { .vid = 0x27c6, .pid = 0x5042 }, { .vid = 0x27c6, .pid = 0x5110 }, { .vid = 0x27c6, .pid = 0x5117 }, From 7d0956513bcaa98205f5483e6375f83300450eab Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 30 Nov 2020 19:17:11 +0100 Subject: [PATCH 3/6] upekts: Remove duplicated err handling path Closes: #342 --- libfprint/drivers/upekts.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c index 824e5d18..3471cf76 100644 --- a/libfprint/drivers/upekts.c +++ b/libfprint/drivers/upekts.c @@ -527,15 +527,6 @@ initsm_read_msg_response_cb (FpiSsm *ssm, fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, "Unexpected response subcommand")); } - else if (seq != upekdev->seq) - { - fp_err ("expected response to cmd seq=%02x, got response to %02x " - "in state %d", upekdev->seq, seq, - fpi_ssm_get_cur_state (ssm)); - fpi_ssm_mark_failed (ssm, - fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, - "Unexpected sequence number in response")); - } else { fpi_ssm_next_state (ssm); From ce39f27b5e31e78161a5900c78d4e8d154dc956c Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 30 Nov 2020 19:19:26 +0100 Subject: [PATCH 4/6] vfs301_proto: Remove usless break after return Closes: #341 --- libfprint/drivers/vfs301_proto.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libfprint/drivers/vfs301_proto.c b/libfprint/drivers/vfs301_proto.c index 79e56bf3..f6106b60 100644 --- a/libfprint/drivers/vfs301_proto.c +++ b/libfprint/drivers/vfs301_proto.c @@ -213,11 +213,9 @@ vfs301_proto_generate (int type, int subtype, gssize *len) *len = 1; return data; } - break; case 0x0B: return vfs301_proto_generate_0B (subtype, len); - break; case 0x02D0: { @@ -233,22 +231,18 @@ vfs301_proto_generate (int type, int subtype, gssize *len) g_assert ((int) subtype <= G_N_ELEMENTS (dataLs)); return translate_str (dataLs[subtype - 1], len); } - break; case 0x0220: switch (subtype) { case 1: return translate_str (vfs301_0220_01, len); - break; case 2: return translate_str (vfs301_0220_02, len); - break; case 3: return translate_str (vfs301_0220_03, len); - break; case 0xFA00: case 0x2C01: @@ -271,7 +265,6 @@ vfs301_proto_generate (int type, int subtype, gssize *len) field[3] = field[1]; return data; - break; } default: From 0bb132b167fa7096ad6174e6e830b217814cbdac Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Tue, 1 Dec 2020 10:12:57 +0100 Subject: [PATCH 5/6] NEWS: Fix release date of 1.90.4 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 955304c8..4f992adc 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ This file lists notable changes in each release. For the full history of all changes, see ChangeLog. -2020-06-08: v1.90.4 release +2020-11-27: v1.90.4 release This release contains a number of important bugfixes. On the feature side, the USB hotplug support was improved. A lot of drivers received fixes and From 5cb91a418975a52da8a5606e9402dcad03a05412 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Tue, 1 Dec 2020 10:11:39 +0100 Subject: [PATCH 6/6] Release 1.90.5 --- NEWS | 10 ++++++++++ meson.build | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 4f992adc..e33b3f34 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,16 @@ This file lists notable changes in each release. For the full history of all changes, see ChangeLog. +2020-12-01: v1.90.5 release + +The 1.90.4 release caused a major regression, as it included a USB hub in +UDEV the autosupend rule list. + +Highlights: + * Remove USB hub from udev autosupend rules + * synaptics: Add PID 0x00c9 which is used in some HP laptops + + 2020-11-27: v1.90.4 release This release contains a number of important bugfixes. On the feature side, diff --git a/meson.build b/meson.build index abfc5c49..502fe042 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('libfprint', [ 'c', 'cpp' ], - version: '1.90.4', + version: '1.90.5', license: 'LGPLv2.1+', default_options: [ 'buildtype=debugoptimized',