mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-06-11 02:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

debian/patches: Add support for new Synaptics devices IDs

Browse Source 
LP: #1905593
This commit is contained in:
Marco Trevisan (Treviño)
2020-11-25 18:12:11 +01:00
parent 32767f4e16
commit 576beb1ff5
3 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/patches/series
Vendored
+2
View File
@@ -5,3 +5,5 @@ aes3k-Fix-transfer-error-path-and-cancellable-lifetime.patch
tests-Add-AES3500-test-case.patch
usb-transfer-Work-around-libgusb-cancellation-issue.patch
aes3k-Re-send-some-commands-for-each-capture.patch
synaptics-add-support-to-pid-0xF9-0xFC-0xC2.patch
synaptics-Fix-missing-reference-to-interrupt-transfer.patch
debian/patches/synaptics-Fix-missing-reference-to-interrupt-transfer.patch
Vendored
+32
View File
@@ -0,0 +1,32 @@
From: Benjamin Berg <bberg@redhat.com>
Date: Mon, 19 Oct 2020 16:59:28 +0200
Subject: synaptics: Fix missing reference to interrupt transfer
When resubmitting the interrupt transfer we need to add a new reference
as the submit function will steal it again.
Origin: https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/90a1abf2
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfprint/+bug/1905593
---
libfprint/drivers/synaptics/synaptics.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
index a3d2a51..ee56271 100644
--- a/libfprint/drivers/synaptics/synaptics.c
+++ b/libfprint/drivers/synaptics/synaptics.c
@@ -202,7 +202,13 @@ cmd_interrupt_cb (FpiUsbTransfer *transfer,
if (transfer->buffer[0] & USB_ASYNC_MESSAGE_PENDING || error)
fpi_ssm_next_state (transfer->ssm);
else
- fpi_usb_transfer_submit (transfer, 1000, NULL, cmd_interrupt_cb, NULL);
+ {
+ fpi_usb_transfer_submit (fpi_usb_transfer_ref (transfer),
+ 1000,
+ NULL,
+ cmd_interrupt_cb,
+ NULL);
+ }
}
static void
debian/patches/synaptics-add-support-to-pid-0xF9-0xFC-0xC2.patch
Vendored
+25
View File
@@ -0,0 +1,25 @@
From: Vincent Huang <vincent.huang@tw.synaptics.com>
Date: Thu, 15 Oct 2020 12:20:34 +0800
Subject: synaptics: add support to pid 0xF9, 0xFC, 0xC2
Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/31319d9c6
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfprint/+bug/1905593
---
libfprint/drivers/synaptics/synaptics.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libfprint/drivers/synaptics/synaptics.c b/libfprint/drivers/synaptics/synaptics.c
index 9bbae99..a3d2a51 100644
--- a/libfprint/drivers/synaptics/synaptics.c
+++ b/libfprint/drivers/synaptics/synaptics.c
@@ -31,6 +31,9 @@ static const FpIdEntry id_table[] = {
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0xBD, },
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0xE9, },
{ .vid = SYNAPTICS_VENDOR_ID, .pid = 0xDF, },
+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0xF9, },
+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0xFC, },
+ { .vid = SYNAPTICS_VENDOR_ID, .pid = 0xC2, },
{ .vid = 0, .pid = 0, .driver_data = 0 }, /* terminating entry */
};