---

yaml --- r: 290906 b: refs/heads/master c: 4777bfd h: refs/heads/master v: v3
git-mirror · Feb 13, 2012 · 62a601d · 62a601d
1 parent b0e3993
commit 62a601d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7aa611a0ecf1d22f21e26279e1a3baf1db6b973
+refs/heads/master: 4777bfdebbddc1f58d9148de5a3e00375d063768
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
@@ -1553,7 +1553,7 @@ int hci_add_adv_entry(struct hci_dev *hdev,
 	if (hci_find_adv_entry(hdev, &ev->bdaddr))
 		return 0;
 
-	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
+	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
 	if (!entry)
 		return -ENOMEM;