From: Andre Guedes Date: Tue, 31 Jan 2012 02:31:28 +0000 (-0300) Subject: Bluetooth: Use GFP_KERNEL in hci_add_adv_entry() X-Git-Tag: firefly_0821_release~3680^2~3338^2~112^2~198 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4777bfdebbddc1f58d9148de5a3e00375d063768;p=firefly-linux-kernel-4.4.55.git Bluetooth: Use GFP_KERNEL in hci_add_adv_entry() This function is not called in interrupt context anymore, so it should use GFP_KERNEL to allocate memory. Signed-off-by: Andre Guedes Acked-by: Marcel Holtmann Signed-off-by: Johan Hedberg --- diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 91166dbbe35c..45e2d2a72b15 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1553,7 +1553,7 @@ int hci_add_adv_entry(struct hci_dev *hdev, if (hci_find_adv_entry(hdev, &ev->bdaddr)) return 0; - entry = kzalloc(sizeof(*entry), GFP_ATOMIC); + entry = kzalloc(sizeof(*entry), GFP_KERNEL); if (!entry) return -ENOMEM;