---

yaml --- r: 290898 b: refs/heads/master c: cb601d7 h: refs/heads/master v: v3
git-mirror · Feb 13, 2012 · 0fb98f4 · 0fb98f4
1 parent fc85837
commit 0fb98f4
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: cad8f1d072375a550ca81419799ba381118c14bb
+refs/heads/master: cb601d7e65f497a2a172d65b2ef1d738ac6fe4f4
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
@@ -373,7 +373,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
 
 	BT_DBG("%s dst %s", hdev->name, batostr(dst));
 
-	conn = kzalloc(sizeof(struct hci_conn), GFP_ATOMIC);
+	conn = kzalloc(sizeof(struct hci_conn), GFP_KERNEL);
 	if (!conn)
 		return NULL;