colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtk: fix task completion when loading supported modes

Browse Source
This commit is contained in:
Aleksander Morgado
2022-08-24 13:51:12 +00:00
parent 0d6b6ebcf1
commit ff7e062e94
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/mtk/mm-broadband-modem-mtk.c
View File

@@ -199,14 +199,12 @@ get_supported_modes_ready (MMBaseModem *self,
g_assert (r != NULL); g_assert (r != NULL);
if (!g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &match_error)) { if (!g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &match_error)) {
if (match_error) { if (match_error)
g_propagate_error (&error, match_error); g_task_return_error (task, error);
} else { else
g_set_error (&error, g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Failed to match EGMR response: %s", response); "Failed to match EGMR response: %s", response);
} g_object_unref (task);
g_match_info_free (match_info); g_match_info_free (match_info);
g_regex_unref (r); g_regex_unref (r);
@@ -214,11 +212,10 @@ get_supported_modes_ready (MMBaseModem *self,
} }
if (!mm_get_int_from_match_info (match_info, 1, &device_type)) { if (!mm_get_int_from_match_info (match_info, 1, &device_type)) {
g_set_error (&error, g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Failed to parse the allowed mode response: '%s'", "Failed to parse the allowed mode response: '%s'",
response); response);
g_object_unref (task);
g_regex_unref (r); g_regex_unref (r);
g_match_info_free (match_info); g_match_info_free (match_info);