From: David Herrmann <dh.herrmann@googlemail.com>
Date: Sat, 7 Jan 2012 14:19:38 +0000 (+0100)
Subject: Bluetooth: hci-uart-h4: Use GFP_ATOMIC in open()
X-Git-Tag: v3.4-rc1~177^2~112^2~259
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fdcd1661a6b22e3ac429759627d2b4d68f77d64a;p=karo-tx-linux.git

Bluetooth: hci-uart-h4: Use GFP_ATOMIC in open()

The uart_proto open() callback is not called in atomic context so we can safely
sleep here. The caller hci_uart_set_proto() in hci_ldisc.c is an ioctl-handler
and therefore can sleep.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---

diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 2fcd8b387d69..748329468d26 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/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;