Diff between 0c575e46ec7eacb90709525fadf47e80d236b064 and 0691f7f30e190eb40063df3f5feadd923f7395a8

Changed Files

File Additions Deletions Status
src/device.c +6 -9 modified

Full Patch

diff --git a/src/device.c b/src/device.c
index 13deebd..18d0d46 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1224,14 +1224,6 @@ void device_add_eir_uuids(struct btd_device *dev, GSList *uuids)
 						DEVICE_INTERFACE, "UUIDs");
 }
 
-static int device_resolve_svc(struct btd_device *dev, DBusMessage *msg)
-{
-	if (device_is_bredr(dev))
-		return device_browse_sdp(dev, msg);
-	else
-		return device_browse_primary(dev, msg);
-}
-
 static struct btd_service *find_connectable_service(struct btd_device *dev,
 							const char *uuid)
 {
@@ -1332,7 +1324,12 @@ static DBusMessage *connect_profiles(struct btd_device *dev, DBusMessage *msg,
 	return NULL;
 
 resolve_services:
-	err = device_resolve_svc(dev, msg);
+	DBG("Resolving services for %s", dev->path);
+
+	if (device_is_bredr(dev))
+		err = device_browse_sdp(dev, msg);
+	else
+		err = device_browse_primary(dev, msg);
 	if (err < 0)
 		return btd_error_failed(msg, strerror(-err));