From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 4 Jan 2013 18:39:02 +0000 (-0800)
Subject: core: Be safe and unregister index added/removed handlers
X-Git-Tag: android-x86-4.4-r3~9097
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=41f8a6d5214840b8e8219a1bb4758b5620834a98;p=android-x86%2Fexternal-bluetooth-bluez.git

core: Be safe and unregister index added/removed handlers
---

diff --git a/src/adapter.c b/src/adapter.c
index e8a983afa..b7a564f52 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -4007,6 +4007,15 @@ void adapter_cleanup(void)
 		btd_adapter_unref(adapter);
 	}
 
+	/*
+	 * In case there is another reference active, clear out
+	 * registered handlers for index added and index removed.
+	 *
+	 * This is just an extra precaution to be safe, and in
+	 * reality should not make a difference.
+	 */
+	mgmt_unregister_index(mgmt, MGMT_INDEX_NONE);
+
 	mgmt_unref(mgmt);
 	mgmt = NULL;
 }