diff options
| -rw-r--r-- | drivers/atmodem/phonebook.c | 3 | ||||
| -rw-r--r-- | drivers/atmodem/sms.c | 3 | ||||
| -rw-r--r-- | drivers/hfpmodem/voicecall.c | 6 | ||||
| -rw-r--r-- | drivers/hsomodem/gprs-context.c | 3 | ||||
| -rw-r--r-- | drivers/mbmmodem/gprs-context.c | 3 |
5 files changed, 12 insertions, 6 deletions
diff --git a/drivers/atmodem/phonebook.c b/drivers/atmodem/phonebook.c index 473a32d5..8a390692 100644 --- a/drivers/atmodem/phonebook.c +++ b/drivers/atmodem/phonebook.c @@ -489,8 +489,9 @@ static void at_list_charsets_cb(gboolean ok, GAtResult *result, "phonebook is possible on this modem," " if this is in error, submit patches " "to properly support this hardware"); - } else + } else { goto error; + } } if (g_at_chat_send(pbd->chat, "AT+CPBS=?", cpbs_prefix, diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c index 1b1b3923..bf3d4542 100644 --- a/drivers/atmodem/sms.c +++ b/drivers/atmodem/sms.c @@ -149,8 +149,9 @@ static void at_csca_query_cb(gboolean ok, GAtResult *result, gpointer user_data) if (number[0] == '+') { number = number + 1; sca.type = 145; - } else + } else { sca.type = 129; + } strncpy(sca.number, number, OFONO_MAX_PHONE_NUMBER_LENGTH); sca.number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0'; diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c index 71f14f69..a06eb5d9 100644 --- a/drivers/hfpmodem/voicecall.c +++ b/drivers/hfpmodem/voicecall.c @@ -983,9 +983,10 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc, call->status = CALL_STATUS_ACTIVE; ofono_voicecall_notify(vc, call); - } else + } else { g_at_chat_send(vd->chat, "AT+CLCC", clcc_prefix, clcc_poll_cb, vc, NULL); + } break; @@ -1063,8 +1064,9 @@ static void ciev_callheld_notify(struct ofono_voicecall *vc, call->status = CALL_STATUS_HELD; ofono_voicecall_notify(vc, call); } - } else if (callheld == 1) + } else if (callheld == 1) { release_with_status(vc, CALL_STATUS_ACTIVE); + } } vd->cind_val[HFP_INDICATOR_CALLHELD] = value; diff --git a/drivers/hsomodem/gprs-context.c b/drivers/hsomodem/gprs-context.c index 1011fc50..0526fcc3 100644 --- a/drivers/hsomodem/gprs-context.c +++ b/drivers/hsomodem/gprs-context.c @@ -313,8 +313,9 @@ static void owancall_notifier(GAtResult *result, gpointer user_data) gcd->hso_state = HSO_NONE; gcd->down_cb = NULL; gcd->cb_data = NULL; - } else + } else { ofono_gprs_context_deactivated(gc, gcd->active_context); + } gcd->active_context = 0; break; diff --git a/drivers/mbmmodem/gprs-context.c b/drivers/mbmmodem/gprs-context.c index 407a2d3c..3063810b 100644 --- a/drivers/mbmmodem/gprs-context.c +++ b/drivers/mbmmodem/gprs-context.c @@ -183,8 +183,9 @@ static void mbm_state_changed(struct ofono_gprs_context *gc, int state) CALLBACK_WITH_FAILURE(gcd->up_cb, NULL, 0, NULL, NULL, NULL, NULL, gcd->cb_data); gcd->up_cb = NULL; - } else + } else { ofono_gprs_context_deactivated(gc, gcd->active_context); + } gcd->mbm_state = MBM_NONE; gcd->cb_data = NULL; |