qmi: free cb_data on error

...and move allocation of structure up to variable declarations to
match the pattern used elsewhere in the code.
This commit is contained in:
Jonas Bonn 2017-04-15 17:34:41 +02:00 committed by Denis Kenzior
parent 91b89f472f
commit f0f5a19af5
1 changed files with 3 additions and 2 deletions

View File

@ -207,13 +207,12 @@ static void qmi_gprs_read_settings(struct ofono_gprs_context* gc,
void *user_data)
{
struct gprs_context_data *data = ofono_gprs_context_get_data(gc);
struct cb_data *cbd;
struct cb_data *cbd = cb_data_new(cb, user_data);
DBG("cid %u", cid);
data->active_context = cid;
cbd = cb_data_new(cb, user_data);
cbd->user = gc;
if (qmi_service_send(data->wds, QMI_WDS_START_NET, NULL,
@ -223,6 +222,8 @@ static void qmi_gprs_read_settings(struct ofono_gprs_context* gc,
data->active_context = 0;
CALLBACK_WITH_FAILURE(cb, cbd->data);
g_free(cbd);
}
static void qmi_activate_primary(struct ofono_gprs_context *gc,