diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-10-29 23:41:28 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-11-06 11:45:02 +0100 |
| commit | 5265c0bd7c3bc28a0d77c836f691d0b0fca2fa0f (patch) | |
| tree | 87b32cad0a12a3731d6469649cc3ee250fad4468 | |
| parent | d7288861a595db7f07b8ecf6bdc30d957b8b6843 (diff) | |
modem-helpers-qmi: don't check result when parsing UIM Get Card Status Output
Do it earlier, before running the parser.
| -rw-r--r-- | src/mm-broadband-modem-qmi.c | 7 | ||||
| -rw-r--r-- | src/mm-modem-helpers-qmi.c | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index 352adf00..2bff104c 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -695,7 +695,7 @@ unlock_required_uim_get_card_status_ready (QmiClientUim *client, ctx = g_task_get_task_data (task); output = qmi_client_uim_get_card_status_finish (client, res, &error); - if (!output) { + if (!output || !qmi_message_uim_get_card_status_output_get_result (output, &error)) { g_prefix_error (&error, "QMI operation failed: "); g_task_return_error (task, error); g_object_unref (task); @@ -947,7 +947,7 @@ unlock_retries_uim_get_card_status_ready (QmiClientUim *client, self = g_task_get_source_object (task); output = qmi_client_uim_get_card_status_finish (client, res, &error); - if (!output) { + if (!output || !qmi_message_uim_get_card_status_output_get_result (output, &error)) { g_prefix_error (&error, "QMI operation failed: "); g_task_return_error (task, error); g_object_unref (task); @@ -1933,8 +1933,7 @@ get_sim_lock_status_via_get_card_status_ready (QmiClientUim *client, ctx = g_task_get_task_data (task); output = qmi_client_uim_get_card_status_finish (client, res, &error); - if (!output || - !qmi_message_uim_get_card_status_output_get_result (output, &error)) { + if (!output || !qmi_message_uim_get_card_status_output_get_result (output, &error)) { g_prefix_error (&error, "QMI operation failed: "); g_task_return_error (task, error); g_object_unref (task); diff --git a/src/mm-modem-helpers-qmi.c b/src/mm-modem-helpers-qmi.c index af0926fb..584d0618 100644 --- a/src/mm-modem-helpers-qmi.c +++ b/src/mm-modem-helpers-qmi.c @@ -1818,11 +1818,6 @@ mm_qmi_uim_get_card_status_output_parse (gpointer log_ * purposes, we're going to consider as the SIM to use the one identified as * 'primary GW' exclusively. We don't really support Dual Sim Dual Standby yet. */ - if (!qmi_message_uim_get_card_status_output_get_result (output, error)) { - g_prefix_error (error, "QMI operation failed: "); - return FALSE; - } - qmi_message_uim_get_card_status_output_get_card_status ( output, &index_gw_primary, |