From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 18 Sep 2009 18:21:03 +0000 (-0700)
Subject: Destroy the AT chat object only when modem got disabled
X-Git-Tag: 0.43~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d88e7eeeeb395a10a4fb31bcf2b52c87f13772c;p=platform%2Fupstream%2Fconnman.git

Destroy the AT chat object only when modem got disabled
---

diff --git a/plugins/mbm.c b/plugins/mbm.c
index 3acd9c1..4b58ea4 100644
--- a/plugins/mbm.c
+++ b/plugins/mbm.c
@@ -436,8 +436,14 @@ static void cfun_disable(gboolean ok, GAtResult *result,
 						gpointer user_data)
 {
 	struct connman_device *device = user_data;
+	struct mbm_data *data = connman_device_get_data(device);
 
 	connman_device_set_powered(device, FALSE);
+
+	if (data->chat != NULL) {
+		g_at_chat_unref(data->chat);
+		data->chat = NULL;
+	}
 }
 
 static void cfun_query(gboolean ok, GAtResult *result,
@@ -588,6 +594,11 @@ static void mbm_remove(struct connman_device *device)
 
 	connman_rtnl_remove_watch(data->watch);
 
+	if (data->chat != NULL) {
+		g_at_chat_unref(data->chat);
+		data->chat = NULL;
+	}
+
 	g_free(data->imsi);
 	g_free(data);
 }
@@ -662,9 +673,6 @@ static int mbm_disable(struct connman_device *device)
 	index = connman_device_get_index(device);
 	connman_inet_ifdown(index);
 
-	g_at_chat_unref(data->chat);
-	data->chat = NULL;
-
 	return -EINPROGRESS;
 }