---

yaml --- r: 290847 b: refs/heads/master c: f5fd5ba h: refs/heads/master i: 290845: 6030226 290843: 765ae58 290839: 9644ea0 290831: 2f764f8 290815: ef80cab v: v3
git-mirror · Feb 13, 2012 · 092cb0a · 092cb0a
1 parent 3c5a36c
commit 092cb0a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;