hcid: removing device object when some error occurs during bonding process

1 files changed, 5 insertions, 0 deletions

diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c
index 36c9a9bd..f7233285 100644
--- a/hcid/dbus-hci.c
+++ b/hcid/dbus-hci.c
@@ -333,6 +333,9 @@ static void reply_pending_requests(const char *path, struct adapter *adapter)
 	/* pending bonding */
 	if (adapter->bonding) {
 		error_authentication_canceled(connection, adapter->bonding->msg);
+
+		remove_pending_device(adapter);
+
 		name_listener_remove(connection,
 					dbus_message_get_sender(adapter->bonding->msg),
 					(name_cb_t) create_bond_req_exit,
@@ -2435,6 +2438,8 @@ void create_bond_req_exit(const char *name, struct adapter *adapter)
 		g_free(p);
 	}
 
+	remove_pending_device(adapter);
+
 	g_io_channel_close(adapter->bonding->io);
 	if (adapter->bonding->io_id)
 		g_source_remove(adapter->bonding->io_id);