diff options
| author | Andre Guedes | 2012-01-31 03:31:28 +0100 |
|---|---|---|
| committer | Johan Hedberg | 2012-02-13 16:01:31 +0100 |
| commit | 4777bfdebbddc1f58d9148de5a3e00375d063768 (patch) | |
| tree | 978361cf0f218ee1a8c72a2d73ef43e30b17a0d6 /net/bluetooth/hci_core.c | |
| parent | Bluetooth: Rename smp_key_size to enc_key_size (diff) | |
| download | kernel-qcow2-linux-4777bfdebbddc1f58d9148de5a3e00375d063768.tar.gz kernel-qcow2-linux-4777bfdebbddc1f58d9148de5a3e00375d063768.tar.xz kernel-qcow2-linux-4777bfdebbddc1f58d9148de5a3e00375d063768.zip | |
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 <aguedespe@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |