aboutsummaryrefslogtreecommitdiff
path: root/src/mm-broadband-modem.c
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-03-30 16:11:55 +0200
committerAleksander Morgado <aleksander@lanedo.com>2012-03-30 16:11:55 +0200
commit3094e3f26b3b369f4b29fe54a8c4692bb611014d (patch)
tree334612b5bbe7a35c013475c3aafbd802b9c1a892 /src/mm-broadband-modem.c
parent8c84aea3f0ca03dee98efa854a2862c1c36b6c04 (diff)
manager: try to get all modems disabled before while shutting down
Diffstat (limited to 'src/mm-broadband-modem.c')
-rw-r--r--src/mm-broadband-modem.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 7b7b162f..fd304643 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -6071,15 +6071,13 @@ disable (MMBaseModem *self,
switch (MM_BROADBAND_MODEM (self)->priv->modem_state) {
case MM_MODEM_STATE_UNKNOWN:
case MM_MODEM_STATE_FAILED:
- /* We should never have a UNKNOWN|FAILED->DISABLED transition requested by
- * the user. */
- g_assert_not_reached ();
- break;
-
case MM_MODEM_STATE_INITIALIZING:
case MM_MODEM_STATE_LOCKED:
case MM_MODEM_STATE_DISABLED:
- /* Just return success, don't relaunch disabling */
+ /* Just return success, don't relaunch disabling.
+ * Note that we do consider here UNKNOWN and FAILED status on purpose,
+ * as the MMManager will try to disable every modem before removing
+ * it. */
g_simple_async_result_set_op_res_gboolean (result, TRUE);
break;