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

core: skip suggesting FCC unlock may be needed

Browse Source 
This message is too specific, and there are a lot of cases where it
wouldn't apply.

E.g. when a MBIM module is stuck in low power mode due to some other
reason (like hardware rfkill), this message would pop up to the users
and completely confuse them.
This commit is contained in:
Aleksander Morgado
2021-06-06 12:11:08 +02:00
parent eefcf9204f
commit 464c0d464c
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mm-broadband-modem-mbim.c
View File

@@ -1588,8 +1588,7 @@ radio_state_set_up_ready (MbimDevice *device,
* older devices. The original logic in the MBIM implemetation triggered a retry
* for any kind of error, so let's do the same for now. */
mm_obj_warn (self, "%s", error->message);
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_RETRY,
"FCC unlock may be needed");
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_RETRY, "Invalid transition");
g_object_unref (task);
}

2
src/mm-broadband-modem-qmi.c
View File

@@ -1653,7 +1653,7 @@ dms_set_operating_mode_ready (QmiClientDms *client,
((g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_INTERNAL) ||
g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_INVALID_TRANSITION)))) {
g_clear_error (&error);
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_RETRY, "FCC unlock may be needed");
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_RETRY, "Invalid transition");
}
}