[PATCH 1/2 v3] Fix creating device object when connection fails

[PATCH 1/2 v3] Fix creating device object when connection fails

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>

There is no need to create a new object since there is no connection and
the device is not permanent/paired.
---
 src/event.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/event.c b/src/event.c
index ff768c0..cbaf9d7 100644
--- a/src/event.c
+++ b/src/event.c
@@ -676,7 +676,12 @@ void btd_event_conn_failed(bdaddr_t *local, bdaddr_t *peer, uint8_t status)
 	struct btd_device *device;
 	DBusConnection *conn = get_dbus_connection();
 
-	if (!get_adapter_and_device(local, peer, &adapter, &device, TRUE))
+	DBG("status 0x%02x", status);
+
+	if (!get_adapter_and_device(local, peer, &adapter, &device, FALSE))
+		return;
+
+	if (!device)
 		return;
 
 	if (device_is_temporary(device))
-- 
1.7.1

Re: [PATCH 1/2 v3] Fix creating device object when connection fails

[Johan Hedberg]

Hi Luiz,

On Tue, Feb 01, 2011, Luiz Augusto von Dentz wrote:
> There is no need to create a new object since there is no connection and
> the device is not permanent/paired.
> ---
>  src/event.c |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)

Thanks. This one has been pushed upstream now. I'll skip 2/2 since it
should never happen that there's a connection without a corresponding
device object.

Johan