From 6030226bf62e547f507970491aef299967b93664 Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@googlemail.com>
Date: Sat, 7 Jan 2012 15:19:38 +0100
Subject: [PATCH] --- yaml --- r: 290845 b: refs/heads/master c:
 fdcd1661a6b22e3ac429759627d2b4d68f77d64a h: refs/heads/master i:   290843:
 765ae58e1a77e1c0a598f198f5c81bfab51e1b96 v: v3

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

diff --git a/[refs] b/[refs]
index f879f4c710f9..ae10c7608a19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9eb648c39af8c14cb63fc9ccfc9a52cdb4442daa
+refs/heads/master: fdcd1661a6b22e3ac429759627d2b4d68f77d64a
diff --git a/trunk/drivers/bluetooth/hci_h4.c b/trunk/drivers/bluetooth/hci_h4.c
index 2fcd8b387d69..748329468d26 100644
--- a/trunk/drivers/bluetooth/hci_h4.c
+++ b/trunk/drivers/bluetooth/hci_h4.c
@@ -69,7 +69,7 @@ static int h4_open(struct hci_uart *hu)
 
 	BT_DBG("hu %p", hu);
 
-	h4 = kzalloc(sizeof(*h4), GFP_ATOMIC);
+	h4 = kzalloc(sizeof(*h4), GFP_KERNEL);
 	if (!h4)
 		return -ENOMEM;