diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2021-06-06 12:11:08 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2021-06-06 12:15:07 +0200 |
| commit | f62b4ec0f604710435da1e03d1324f8a0e9aba8f (patch) | |
| tree | 57a33f9113939d35779b66f71ac815154996d3a4 | |
| parent | b610ea14019e4645a29a87b51be08d712b243f03 (diff) | |
| download | ModemManager-f62b4ec0f604710435da1e03d1324f8a0e9aba8f.tar.gz | |
core: skip suggesting FCC unlock may be needed
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.
(cherry picked from commit 464c0d464c758387ac3d35f4e148db2c4368edba)
| -rw-r--r-- | src/mm-broadband-modem-mbim.c | 3 | ||||
| -rw-r--r-- | src/mm-broadband-modem-qmi.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index e7f6e1da2..027ca9317 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -1545,8 +1545,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); } diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index b8240c696..bc61461d7 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -1679,7 +1679,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"); } } |