---
 drivers/ifxmodem/radio-settings.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/ifxmodem/radio-settings.c 
b/drivers/ifxmodem/radio-settings.c
index fd590ae..6771e00 100644
--- a/drivers/ifxmodem/radio-settings.c
+++ b/drivers/ifxmodem/radio-settings.c
@@ -104,11 +104,13 @@ static void ifx_query_rat_mode(struct 
ofono_radio_settings *rs,
        struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
        struct cb_data *cbd = cb_data_new(cb, data);
 
-       if (g_at_chat_send(rsd->chat, "AT+XRAT?", xrat_prefix,
-                                       xrat_query_cb, cbd, g_free) == 0) {
-               CALLBACK_WITH_FAILURE(cb, -1, data);
-               g_free(cbd);
-       }
+       if (cbd && g_at_chat_send(rsd->chat, "AT+XRAT?", xrat_prefix,
+                                       xrat_query_cb, cbd, g_free) > 0)
+               return;
+
+       g_free(cbd);
+
+       CALLBACK_WITH_FAILURE(cb, -1, data);
 }
 
 static void xrat_modify_cb(gboolean ok, GAtResult *result, gpointer user_data)
@@ -131,6 +133,9 @@ static void ifx_set_rat_mode(struct ofono_radio_settings 
*rs,
        char buf[20];
        int value = 1, preferred = 2;
 
+       if (cbd == NULL)
+               goto error;
+
        switch (mode) {
        case OFONO_RADIO_ACCESS_MODE_ANY:
                value = 1;
-- 
1.7.0.4

_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono

Reply via email to