projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7aa611
)
Bluetooth: Use GFP_KERNEL in hci_add_adv_entry()
author
Andre Guedes
<aguedespe@gmail.com>
Tue, 31 Jan 2012 02:31:28 +0000
(23:31 -0300)
committer
Johan Hedberg
<johan.hedberg@intel.com>
Mon, 13 Feb 2012 15:01:31 +0000
(17:01 +0200)
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>
net/bluetooth/hci_core.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/hci_core.c
b/net/bluetooth/hci_core.c
index
91166db
..
45e2d2a
100644
(file)
--- 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;