---

yaml --- r: 290899 b: refs/heads/master c: 75d7735 h: refs/heads/master i: 290897: fc85837 290895: 37c2fd3 v: v3
git-mirror · Feb 13, 2012 · a07ae45 · a07ae45
1 parent 0fb98f4
commit a07ae45
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: cb601d7e65f497a2a172d65b2ef1d738ac6fe4f4
+refs/heads/master: 75d7735c7a3ddc3842473219460285748d10db11
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
@@ -945,7 +945,7 @@ struct hci_chan *hci_chan_create(struct hci_conn *conn)
 
 	BT_DBG("%s conn %p", hdev->name, conn);
 
-	chan = kzalloc(sizeof(struct hci_chan), GFP_ATOMIC);
+	chan = kzalloc(sizeof(struct hci_chan), GFP_KERNEL);
 	if (!chan)
 		return NULL;