From 43208828ab792295d2d9396babbb00d8a1f58fd3 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 20 Nov 2015 22:54:27 -0600 Subject: rilmodem: Implement ril_register_manual inline --- drivers/rilmodem/network-registration.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/rilmodem/network-registration.c b/drivers/rilmodem/network-registration.c index 1a033e23..abe627ec 100644 --- a/drivers/rilmodem/network-registration.c +++ b/drivers/rilmodem/network-registration.c @@ -595,17 +595,23 @@ static void ril_register_manual(struct ofono_netreg *netreg, char buf[OFONO_MAX_MCC_LENGTH + OFONO_MAX_MNC_LENGTH + 1]; struct parcel rilp; + DBG(""); + /* RIL expects a char * specifying MCCMNC of network to select */ snprintf(buf, sizeof(buf), "%s%s", mcc, mnc); - g_ril_request_set_net_select_manual(nd->ril, buf, &rilp); + parcel_init(&rilp); + parcel_w_string(&rilp, buf); + + g_ril_append_print_buf(nd->ril, "(%s)", buf); /* In case of error free cbd and return the cb with failure */ if (g_ril_send(nd->ril, RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, &rilp, - ril_register_cb, cbd, g_free) == 0) { - g_free(cbd); - CALLBACK_WITH_FAILURE(cb, data); - } + ril_register_cb, cbd, g_free) > 0) + return; + + g_free(cbd); + CALLBACK_WITH_FAILURE(cb, data); } static void ril_strength_notify(struct ril_msg *message, gpointer user_data) -- cgit v1.2.3