[MM] [PATCH] iface-modem-3gpp: clear deferred registration state update when disabling

[Ben Chan <benchan chromium org>]

---
 src/mm-iface-modem-3gpp.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c
index fa8da1a..3f3a803 100644
--- a/src/mm-iface-modem-3gpp.c
+++ b/src/mm-iface-modem-3gpp.c
@@ -1325,6 +1325,18 @@ periodic_registration_check_enable (MMIfaceModem3gpp *self)
                              (GDestroyNotify)registration_check_context_free);
 }
 
+static void
+clear_deferred_registration_state_update (MMIfaceModem3gpp *self)
+{
+    RegistrationStateContext *ctx = get_registration_state_context (self);
+
+    ctx->deferred_new_state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN;
+    if (ctx->deferred_update_id) {
+        g_source_remove (ctx->deferred_update_id);
+        ctx->deferred_update_id = 0;
+    }
+}
+
 /*****************************************************************************/
 
 typedef struct _DisablingContext DisablingContext;
@@ -1435,7 +1447,10 @@ interface_disabling_step (DisablingContext *ctx)
         ctx->step++;
     }
 
-    case DISABLING_STEP_CLEANUP_UNSOLICITED_REGISTRATION_EVENTS:
+    case DISABLING_STEP_CLEANUP_UNSOLICITED_REGISTRATION_EVENTS: {
+        /* Prevent any deferred registration state update from happending after the modem is disabled */
+        clear_deferred_registration_state_update (ctx->self);
+
         if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_registration_events &&
             MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_registration_events_finish) {
             MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_registration_events (
@@ -1446,6 +1461,7 @@ interface_disabling_step (DisablingContext *ctx)
         }
         /* Fall down to next step */
         ctx->step++;
+    }
 
     case DISABLING_STEP_CLEANUP_UNSOLICITED_EVENTS:
         if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_events &&
-- 
1.8.1.3