From 2a4e68d64aaa4f8f476633a0c167727c7e2012eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 30 Jun 2026 19:22:51 +0200 Subject: [PATCH] elanmoc: Do not pass NULL error to SSM mark failed The error has been already checked and it's null here, so we need to return a new error --- libfprint/drivers/elanmoc/elanmoc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libfprint/drivers/elanmoc/elanmoc.c b/libfprint/drivers/elanmoc/elanmoc.c index 3d8141a0..4058aa03 100644 --- a/libfprint/drivers/elanmoc/elanmoc.c +++ b/libfprint/drivers/elanmoc/elanmoc.c @@ -390,11 +390,20 @@ elanmoc_enroll_cb (FpiDeviceElanmoc *self, } if (self->num_frames == self->max_moc_enroll_time && buffer_in[1] == ELAN_MSG_OK) - fpi_ssm_next_state (self->task_ssm); + { + fpi_ssm_next_state (self->task_ssm); + } else if (self->num_frames < self->max_moc_enroll_time) - fpi_ssm_jump_to_state (self->task_ssm, MOC_ENROLL_WAIT_FINGER); + { + fpi_ssm_jump_to_state (self->task_ssm, MOC_ENROLL_WAIT_FINGER); + } else - fpi_ssm_mark_failed (self->task_ssm, error); + { + fpi_ssm_mark_failed (self->task_ssm, + fpi_device_error_new_msg (FP_DEVICE_ERROR_PROTO, + "Enrollment failed (status 0x%02x)", + buffer_in[1])); + } } }