From 5bfc4f590dfbcb15b1f82a2fa8f3f92becc1d91d Mon Sep 17 00:00:00 2001
From: Ram Malovany <ramm@ti.com>
Date: Thu, 19 Jul 2012 10:26:09 +0300
Subject: [PATCH] --- yaml --- r: 321993 b: refs/heads/master c:
 c810089c27e48b816181b454fcc493d19fdbc2ba h: refs/heads/master i:   321991:
 04ab1a3309ad71d7da837959c56d87485895e737 v: v3

---
 [refs]                          | 2 +-
 trunk/net/bluetooth/hci_event.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 589ea6121e4b..ee44967997b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9ea3ed9b71cc3271dd59e76f65748adcaa76422
+refs/heads/master: c810089c27e48b816181b454fcc493d19fdbc2ba
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index 248632cec11d..b64cfa213bd6 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -1365,6 +1365,9 @@ static bool hci_resolve_next_name(struct hci_dev *hdev)
 		return false;
 
 	e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED);
+	if (!e)
+		return false;
+
 	if (hci_resolve_name(hdev, e) == 0) {
 		e->name_state = NAME_PENDING;
 		return true;