]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Bluetooth: hci-uart-ath: Use GFP_ATOMIC in open()
authorDavid Herrmann <dh.herrmann@googlemail.com>
Sat, 7 Jan 2012 14:19:40 +0000 (15:19 +0100)
committerJohan Hedberg <johan.hedberg@intel.com>
Mon, 13 Feb 2012 15:01:22 +0000 (17:01 +0200)
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>
drivers/bluetooth/hci_ath.c

index 4093935ddf42619e44fef9b87428c34454104fe8..12172a6a95c440467666d1599f13bab4fe45253f 100644 (file)
@@ -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;