commit 253209e37f869638caec4f9ab9a7e45586380c07
author Johan Hedberg <johan.hedberg@nokia.com> Sat Jan 29 09:20:15 2011 +0200
committer Johan Hedberg <johan.hedberg@nokia.com> Sat Jan 29 09:20:15 2011 +0200
tree 1c60f089a9ee79990bf4e71d81c011e347065e6f
parent d4a25e44a88e15da6f523183b30997e6669c481d

Fix error response for connection failures

src/device.c

diff --git a/src/device.c b/src/device.c
index 2c6dfc2..403defe 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1012,8 +1012,16 @@
 	if (device->agent)
 		agent_free(device->agent);
 
-	if (device->bonding)
-		device_cancel_bonding(device, HCI_OE_USER_ENDED_CONNECTION);
+	if (device->bonding) {
+		uint8_t status;
+
+		if (device->connected)
+			status = HCI_OE_USER_ENDED_CONNECTION;
+		else
+			status = HCI_PAGE_TIMEOUT;
+
+		device_cancel_bonding(device, status);
+	}
 
 	if (device->browse) {
 		discover_services_reply(device->browse, -ECANCELED, NULL);