Move responsibility of freeint the record list to the correct place

3 files changed, 3 insertions, 6 deletions

diff --git a/audio/headset.c b/audio/headset.c
index 5d7b2f81..87d0ee7b 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -1103,7 +1103,6 @@ static void get_record_cb(sdp_list_t *recs, int err, gpointer user_data)
 	}
 
 	sdp_list_free(classes, free);
-	sdp_record_free(record);
 
 	return;
 
@@ -1116,8 +1115,6 @@ failed_not_supported:
 failed:
 	if (classes)
 		sdp_list_free(classes, free);
-	if (record)
-		sdp_record_free(record);
 	pending_connect_finalize(dev);
 	headset_set_state(dev, HEADSET_STATE_DISCONNECTED);
 }
diff --git a/common/glib-helper.c b/common/glib-helper.c
index 64641858..c194eb3b 100644
--- a/common/glib-helper.c
+++ b/common/glib-helper.c
@@ -157,6 +157,9 @@ done:
 	if (ctxt->cb)
 		ctxt->cb(recs, err, ctxt->user_data);
 
+	if (recs)
+		sdp_list_free(recs, (sdp_free_func_t) sdp_record_free);
+
 	search_context_cleanup(ctxt);
 }
 
diff --git a/src/device.c b/src/device.c
index 6ea9c5cc..2bc50711 100644
--- a/src/device.c
+++ b/src/device.c
@@ -906,9 +906,6 @@ cleanup:
 		device->discov_requestor = NULL;
 	}
 
-	if (recs != NULL)
-		sdp_list_free(recs, (sdp_free_func_t) sdp_record_free);
-
 	dbus_message_unref(req->msg);
 	dbus_connection_unref(req->conn);
 	g_slist_free(req->uuids_added);