]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Bluetooth: Use GFP_KERNEL in hci_conn_add()
authorAndre Guedes <andre.guedes@openbossa.org>
Mon, 30 Jan 2012 12:22:09 +0000 (09:22 -0300)
committerJohan Hedberg <johan.hedberg@intel.com>
Mon, 13 Feb 2012 15:01:30 +0000 (17:01 +0200)
This function is called in process context only, so it should use
GFP_KERNEL to allocate memory.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
net/bluetooth/hci_conn.c

index eae7a53467ef89639d3f17acb6480505e454c712..9ec7b8efae506e13a18e7f38228d2f821296b091 100644 (file)
@@ -373,7 +373,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
 
        BT_DBG("%s dst %s", hdev->name, batostr(dst));
 
-       conn = kzalloc(sizeof(struct hci_conn), GFP_ATOMIC);
+       conn = kzalloc(sizeof(struct hci_conn), GFP_KERNEL);
        if (!conn)
                return NULL;