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

index 2fcd8b387d694b74130956fe836b5c211dbee20a..748329468d26ca6432f6e04dc2d2ab92afd62e4f 100644 (file)
@@ -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;