mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2025-11-15 07:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

elanspi: Try to avoid cancellation problems

Browse Source
This commit is contained in:
mincrmatt12
2021-12-22 20:35:30 -05:00
committed by Matthew Mirvish
parent 7565562903
commit 5beac0ded7
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libfprint/drivers/elanspi.c
View File

@@ -439,6 +439,12 @@ elanspi_capture_old_line_handler (FpiSpiTransfer *transfer, FpDevice *dev, gpoin
} }
else else
{ {
/* check for termination */
if (fpi_device_get_current_action (dev) == FPI_DEVICE_ACTION_NONE)
{
fpi_ssm_mark_completed (transfer->ssm);
return;
}
/* check for cancellation */ /* check for cancellation */
if (fpi_device_action_is_cancelled (dev)) if (fpi_device_action_is_cancelled (dev))
{ {
@@ -1486,11 +1492,12 @@ elanspi_fp_capture_ssm_handler (FpiSsm *ssm, FpDevice *dev)
if (self->deactivating) if (self->deactivating)
{ {
fp_dbg ("<capture> got deactivate; exiting"); fp_dbg ("<capture> got deactivate; exiting");
self->deactivating = FALSE;
fpi_ssm_mark_completed (ssm); fpi_ssm_mark_completed (ssm);
/* mark deactivate done */ /* mark deactivate done */
fpi_image_device_deactivate_complete (FP_IMAGE_DEVICE (dev), NULL); fpi_image_device_deactivate_complete (FP_IMAGE_DEVICE (dev), NULL);
self->deactivating = FALSE;
return; return;
} }