From 8d8129974336a30ff05f143936b4c493d3862c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 13 Feb 2025 04:30:46 +0100
Subject: [PATCH] mafpmoc: Clear errors when they are not forwarded

---
 libfprint/drivers/mafpmoc/mafpmoc.c | 41 ++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/libfprint/drivers/mafpmoc/mafpmoc.c b/libfprint/drivers/mafpmoc/mafpmoc.c
index 1f90b38a..037776cc 100644
--- a/libfprint/drivers/mafpmoc/mafpmoc.c
+++ b/libfprint/drivers/mafpmoc/mafpmoc.c
@@ -250,12 +250,13 @@ fp_cmd_receive_cb (FpiUsbTransfer *transfer,
 
   if (error)
     {
-      fp_dbg ("error: %d", error->code);
+      fp_dbg ("error: %d, %s", error->code, error->message);
       if (data->cmd_force_pass) /* ex: G_USB_DEVICE_ERROR_TIMED_OUT */
         {
           if (data->callback)
             data->callback (self, &cmd_reponse, NULL);
           fpi_ssm_mark_completed (transfer->ssm);
+          g_clear_error (&error);
           return;
         }
       fpi_ssm_mark_failed (transfer->ssm, error);
@@ -584,7 +585,10 @@ fp_init_module_status_cb (FpiDeviceMafpmoc    *self,
                           GError              *error)
 {
   if (error)
-    resp->result = 0xff;
+    {
+      resp->result = 0xff;
+      g_clear_error (&error);
+    }
 
   fp_dbg ("result: %d", resp->result);
 
@@ -1173,9 +1177,13 @@ fp_enroll_wait_int_cb (FpiUsbTransfer *transfer,
     {
       fp_dbg ("code %d", error->code);
       if (error->code == G_USB_DEVICE_ERROR_TIMED_OUT)
-        fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_VERIFY_GET_IMAGE);
-      else
-        fpi_ssm_mark_failed (self->task_ssm, error);
+        {
+          fpi_ssm_jump_to_state (self->task_ssm, FP_ENROLL_VERIFY_GET_IMAGE);
+          g_clear_error (&error);
+          return;
+        }
+
+      fpi_ssm_mark_failed (self->task_ssm, g_steal_pointer (&error));
       return;
     }
   fp_dbg ("actual_length %zd", transfer->actual_length);
@@ -1210,7 +1218,16 @@ fp_empty_cb (FpiDeviceMafpmoc    *self,
              mafp_cmd_response_t *resp,
              GError              *error)
 {
-  fp_dbg ("result: %d", resp ? resp->result : -1);
+  if (error)
+    {
+      fp_dbg ("error: %s", error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      fp_dbg ("result: %d", resp ? resp->result : -1);
+    }
+
   fpi_ssm_next_state (self->task_ssm);
 }
 
@@ -1566,7 +1583,9 @@ mafp_get_startup_result_cb (FpiUsbTransfer *transfer,
 
   if (error)
     {
+      fp_dbg ("error: %s", error->message);
       fpi_ssm_next_state (transfer->ssm);
+      g_clear_error (&error);
       return;
     }
   if (transfer->actual_length >= 5)
@@ -1664,9 +1683,13 @@ fp_verify_wait_int_cb (FpiUsbTransfer *transfer,
     {
       fp_dbg ("code %d", error->code);
       if (error->code == G_USB_DEVICE_ERROR_TIMED_OUT)
-        fpi_ssm_jump_to_state (self->task_ssm, FP_VERIFY_GET_IMAGE);
-      else
-        fpi_ssm_mark_failed (self->task_ssm, error);
+        {
+          fpi_ssm_jump_to_state (self->task_ssm, FP_VERIFY_GET_IMAGE);
+          g_clear_error (&error);
+          return;
+        }
+
+      fpi_ssm_mark_failed (self->task_ssm, g_steal_pointer (&error));
       return;
     }
   fp_dbg ("actual_length %zd", transfer->actual_length);