diff options
| -rw-r--r-- | src/mm-iface-modem.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index f0d826c9..30fe20da 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -2907,8 +2907,8 @@ update_unlock_retries (MMIfaceModem *self, typedef enum { UPDATE_LOCK_INFO_CONTEXT_STEP_FIRST = 0, UPDATE_LOCK_INFO_CONTEXT_STEP_LOCK, - UPDATE_LOCK_INFO_CONTEXT_STEP_RETRIES, UPDATE_LOCK_INFO_CONTEXT_STEP_AFTER_UNLOCK, + UPDATE_LOCK_INFO_CONTEXT_STEP_RETRIES, UPDATE_LOCK_INFO_CONTEXT_STEP_LAST } UpdateLockInfoContextStep; @@ -3074,20 +3074,6 @@ update_lock_info_context_step (UpdateLockInfoContext *ctx) /* Fall down to next step */ ctx->step++; - case UPDATE_LOCK_INFO_CONTEXT_STEP_RETRIES: - /* Load unlock retries if possible */ - if (MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_unlock_retries && - MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_unlock_retries_finish) { - MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_unlock_retries ( - ctx->self, - (GAsyncReadyCallback)load_unlock_retries_ready, - ctx); - return; - } - - /* Fall down to next step */ - ctx->step++; - case UPDATE_LOCK_INFO_CONTEXT_STEP_AFTER_UNLOCK: /* If we get that no lock is required, run the after SIM unlock step * in order to wait for the SIM to get ready. Skip waiting on @@ -3113,6 +3099,20 @@ update_lock_info_context_step (UpdateLockInfoContext *ctx) /* Fall down to next step */ ctx->step++; + case UPDATE_LOCK_INFO_CONTEXT_STEP_RETRIES: + /* Load unlock retries if possible */ + if (MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_unlock_retries && + MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_unlock_retries_finish) { + MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->load_unlock_retries ( + ctx->self, + (GAsyncReadyCallback)load_unlock_retries_ready, + ctx); + return; + } + + /* Fall down to next step */ + ctx->step++; + case UPDATE_LOCK_INFO_CONTEXT_STEP_LAST: if (ctx->saved_error) { /* Return saved error */ |