From 0fb98f44ccce3013cf6bf0988d5032739815b93d Mon Sep 17 00:00:00 2001
From: Andre Guedes <andre.guedes@openbossa.org>
Date: Mon, 30 Jan 2012 09:22:09 -0300
Subject: [PATCH] --- yaml --- r: 290898 b: refs/heads/master c:
 cb601d7e65f497a2a172d65b2ef1d738ac6fe4f4 h: refs/heads/master 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 9ba2f69374c7..b0a88add376f 100644
--- 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
index eae7a53467ef..9ec7b8efae50 100644
--- 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;