From 4fa360402bd58c73d31ec629fc4816ef24a9d160 Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Wed, 4 Jun 2014 17:14:44 +0200 Subject: [PATCH] core: Fix cleaning pending services when ACL connection failed In case ACL connection failed to establish, all pending services shall be always removed. At the moment it's only done in case there's pending Connect message which does not take into account reconnect scenario, i.e. service connection was triggered by reconnection timeout and there is no pending message. In such case, when reconnection failed there will be some services on pending list and subsequent reconnect attempts will fail with EBUSY immediately. Change-Id: I785bd791c8623a4452310d410e3dbb524e9976ec Signed-off-by: Sebastian Chlad --- src/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/device.c b/src/device.c index 8222610..a9b644b 100644 --- a/src/device.c +++ b/src/device.c @@ -1220,6 +1220,9 @@ static void device_profile_connected(struct btd_device *dev, return; done: + g_slist_free(dev->pending); + dev->pending = NULL; + if (!dev->connect) return; @@ -1241,9 +1244,6 @@ done: g_dbus_send_reply(dbus_conn, dev->connect, DBUS_TYPE_INVALID); } - g_slist_free(dev->pending); - dev->pending = NULL; - dbus_message_unref(dev->connect); dev->connect = NULL; } -- 2.7.4