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

Bluetooth: hci-uart-ll: 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_ll.c b/drivers/bluetooth/hci_ll.c
index 7e4b435f79f0..b874c0efde24 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -125,7 +125,7 @@ static int ll_open(struct hci_uart *hu)
 
 	BT_DBG("hu %p", hu);
 
-	ll = kzalloc(sizeof(*ll), GFP_ATOMIC);
+	ll = kzalloc(sizeof(*ll), GFP_KERNEL);
 	if (!ll)
 		return -ENOMEM;