]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Bluetooth: hci-uart-ll: Use GFP_ATOMIC in open()
authorDavid Herrmann <dh.herrmann@googlemail.com>
Sat, 7 Jan 2012 14:19:37 +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_ll.c

index 7e4b435f79f04244cdf5c65d2b7eba9852463bf1..b874c0efde247be90f38d0a2772813ea56fd6afa 100644 (file)
@@ -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;