From f20724ec3f5bb4ad9821059021a5d4ee1d74528c Mon Sep 17 00:00:00 2001 From: Ben Chan Date: Fri, 28 Feb 2014 12:30:18 -0800 Subject: iface-modem: allow setting power state to OFF when modem is in FAILED state --- src/mm-iface-modem.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index c0241977..36e42e7f 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -4667,6 +4667,15 @@ interface_initialization_step (InitializationContext *ctx) "handle-set-current-capabilities", G_CALLBACK (handle_set_current_capabilities), ctx->self); + /* Allow setting the power state to OFF even when the modem is in the + * FAILED state as this operation does not necessarily depend on the + * presence of a SIM. handle_set_power_state_auth_ready already ensures + * that the power state can only be set to OFF when the modem is in the + * FAILED state. */ + g_signal_connect (ctx->skeleton, + "handle-set-power-state", + G_CALLBACK (handle_set_power_state), + ctx->self); /* Allow the reset and factory reset operation in FAILED state to rescue the modem. * Also, for a modem that doesn't support SIM hot swapping, a reset is needed to * force the modem to detect the newly inserted SIM. */ @@ -4705,10 +4714,6 @@ interface_initialization_step (InitializationContext *ctx) "handle-enable", G_CALLBACK (handle_enable), ctx->self); - g_signal_connect (ctx->skeleton, - "handle-set-power-state", - G_CALLBACK (handle_set_power_state), - ctx->self); g_signal_connect (ctx->skeleton, "handle-set-current-bands", G_CALLBACK (handle_set_current_bands), -- cgit v1.2.3