---

yaml --- r: 321993 b: refs/heads/master c: c810089 h: refs/heads/master i: 321991: 04ab1a3 v: v3
git-mirror · Aug 6, 2012 · 5bfc4f5 · 5bfc4f5
1 parent 70d4cc2
commit 5bfc4f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;