From 3c5a36cab450e9d4fea935b49cfb1f1c72b19f8d Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@googlemail.com>
Date: Sat, 7 Jan 2012 15:19:39 +0100
Subject: [PATCH] --- yaml --- r: 290846 b: refs/heads/master c:
 c063af346d89be16e38385e55e5630070d6fd512 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ae10c7608a19..1b39f7852689 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdcd1661a6b22e3ac429759627d2b4d68f77d64a
+refs/heads/master: c063af346d89be16e38385e55e5630070d6fd512
diff --git a/trunk/drivers/bluetooth/hci_bcsp.c b/trunk/drivers/bluetooth/hci_bcsp.c
index 9c5b2dc38e29..8bf0c3e774e8 100644
--- a/trunk/drivers/bluetooth/hci_bcsp.c
+++ b/trunk/drivers/bluetooth/hci_bcsp.c
@@ -692,7 +692,7 @@ static int bcsp_open(struct hci_uart *hu)
 
 	BT_DBG("hu %p", hu);
 
-	bcsp = kzalloc(sizeof(*bcsp), GFP_ATOMIC);
+	bcsp = kzalloc(sizeof(*bcsp), GFP_KERNEL);
 	if (!bcsp)
 		return -ENOMEM;