From a07ae452df70c5bdec174912cb13d1b27a60412c Mon Sep 17 00:00:00 2001
From: Andre Guedes <andre.guedes@openbossa.org>
Date: Mon, 30 Jan 2012 09:22:10 -0300
Subject: [PATCH] --- yaml --- r: 290899 b: refs/heads/master c:
 75d7735c7a3ddc3842473219460285748d10db11 h: refs/heads/master i:   290897:
 fc8583726506d314339b1b2f75f3caa95a61dd66   290895:
 37c2fd3010746a97494ea9f91dafb3ae89e5aa8c v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_conn.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b0a88add376f..211959927543 100644
--- 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
index 9ec7b8efae50..7b38a0ba8765 100644
--- 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;