From 779cc467de9f94a22b29989f542fe324a98b2005 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Sun, 26 Sep 2010 07:38:48 -0500 Subject: [PATCH] mbm: Make stk envelope submission work again --- drivers/mbmmodem/stk.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/mbmmodem/stk.c b/drivers/mbmmodem/stk.c index b25d30d..067348a 100644 --- a/drivers/mbmmodem/stk.c +++ b/drivers/mbmmodem/stk.c @@ -60,26 +60,20 @@ static void stke_cb(gboolean ok, GAtResult *result, gpointer user_data) decode_at_error(&error, g_at_result_final_response(result)); - if (!ok) { - cb(&error, NULL, 0, cbd->data); - return; - } + if (!ok) + goto done; g_at_result_iter_init(&iter, result); if (g_at_result_iter_next(&iter, "*STKE:") == FALSE) - goto error; + goto done; - /* Response data is optional */ g_at_result_iter_next_hexstring(&iter, &pdu, &len); DBG("len %d", len); +done: cb(&error, pdu, len, cbd->data); - return; - -error: - CALLBACK_WITH_FAILURE(cb, NULL, 0, cbd->data); } static void mbm_stk_envelope(struct ofono_stk *stk, int length, -- 2.7.4