X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service-adaptation%2Fservices%2Fadapter%2Fbt-service-core-adapter-le.c;h=5f146f3a33d0110c9df86d9a22b24255e17ddeca;hb=d3f64e9c21a3743c3b8fb36e4524a030945e3333;hp=6be230306511a44717b3eb06ba7045d71351ba28;hpb=09c6d4a918ad69c55f9c7b5f9f10d6cdee43d3f7;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/bt-service-adaptation/services/adapter/bt-service-core-adapter-le.c b/bt-service-adaptation/services/adapter/bt-service-core-adapter-le.c
index 6be2303..5f146f3 100644
--- a/bt-service-adaptation/services/adapter/bt-service-core-adapter-le.c
+++ b/bt-service-adaptation/services/adapter/bt-service-core-adapter-le.c
@@ -2136,14 +2136,16 @@ void _bt_check_le_scanner_app_termination(const char *sender)
 	if (!scanner)
 		return;
 
-	if (scanner->is_scanning)
-		_bt_stop_le_scan(sender);
-
 	_bt_bm_remove_scan_app(SCAN_LE, scanner->uid, scanner->pid);
 
+	if (scanner->is_scanning) {
+		/* Free 'scanner' into the function */
+		if (_bt_stop_le_scan(sender) != BLUETOOTH_ERROR_NOT_IN_OPERATION)
+			return;
+	}
+
 	scanner_list = g_slist_remove(scanner_list, scanner);
-	g_free(scanner->sender);
-	g_free(scanner);
+	__bt_free_le_scanner(scanner);
 }
 
 int _bt_service_le_init(void)