From 092cb0aff3f48fe9839e92b0ecf58a1e9dc9eccf Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@googlemail.com>
Date: Sat, 7 Jan 2012 15:19:40 +0100
Subject: [PATCH] --- yaml --- r: 290847 b: refs/heads/master c:
 f5fd5baee39fe941bd73973c63990d153184e3a1 h: refs/heads/master i:   290845:
 6030226bf62e547f507970491aef299967b93664   290843:
 765ae58e1a77e1c0a598f198f5c81bfab51e1b96   290839:
 9644ea0191cd183cbdd0a296fde24ed88cc23c82   290831:
 2f764f8f1a4d90164647203c4d37e7abb7a24b5f   290815:
 ef80caba204a6a27732748ce85563df94c39529e v: v3

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

diff --git a/[refs] b/[refs]
index 1b39f7852689..a328661396f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c063af346d89be16e38385e55e5630070d6fd512
+refs/heads/master: f5fd5baee39fe941bd73973c63990d153184e3a1
diff --git a/trunk/drivers/bluetooth/hci_ath.c b/trunk/drivers/bluetooth/hci_ath.c
index 4093935ddf42..12172a6a95c4 100644
--- a/trunk/drivers/bluetooth/hci_ath.c
+++ b/trunk/drivers/bluetooth/hci_ath.c
@@ -112,7 +112,7 @@ static int ath_open(struct hci_uart *hu)
 
 	BT_DBG("hu %p", hu);
 
-	ath = kzalloc(sizeof(*ath), GFP_ATOMIC);
+	ath = kzalloc(sizeof(*ath), GFP_KERNEL);
 	if (!ath)
 		return -ENOMEM;