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

drivers: aes2550: fix lacking deactivation callback

Browse Source 
In some cases, the driver generates error, but complete_deactivation() is not
called after calling fpi_image_device_session_error(). In this case, fprintd
would be waiting for fpi_image_device_deactivate_complete() forever. Fix by
adding calls for complete_deactivation();

Closes: https://gitlab.freedesktop.org/libfprint/libfprint/-/work_items/786
Assisted-by: DeepSeek:deepseek-v4-pro-preview
Signed-off-by: Shengyu Qu <wiagn@4d2.org>
This commit is contained in:
Shengyu Qu
2026-07-21 21:53:51 +08:00
parent ecb975052d
commit 56edcf7802
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libfprint/drivers/aes2550.c
+12 -1
View File
@@ -95,7 +95,10 @@ finger_det_data_cb (FpiUsbTransfer *transfer, FpDevice *device,
if (error)
{
fpi_image_device_session_error (FP_IMAGE_DEVICE (device), error);
/* Ensure deactivation completes even though the finger-detect
* loop is broken by the session error. */
fpi_image_device_session_error (dev, error);
complete_deactivation (dev);
return;
}
@@ -125,7 +128,10 @@ finger_det_reqs_cb (FpiUsbTransfer *t, FpDevice *device,
if (error)
{
/* Ensure deactivation completes even though the finger-detect
* loop is broken by the session error. */
fpi_image_device_session_error (dev, error);
complete_deactivation (dev);
return;
}
@@ -371,7 +377,12 @@ capture_sm_complete (FpiSsm *ssm, FpDevice *_dev, GError *error)
}
else if (error)
{
/* fpi_image_device_session_error() will trigger dev_deactivate()
* which sets the deactivating flag. Since the SSM is terminating,
* complete_deactivation() must be called here to avoid a deadlock
* where nothing checks the deactivating flag. */
fpi_image_device_session_error (dev, error);
complete_deactivation (dev);
}
else
{