From 464c0d464c758387ac3d35f4e148db2c4368edba Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Sun, 6 Jun 2021 12:11:08 +0200 Subject: [PATCH] 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. --- src/mm-broadband-modem-mbim.c | 3 +-- 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 c87c3ca0..0b48ae0d 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -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); } diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index fac51668..42e4e9ce 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -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"); } }