summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2012-01-30 09:22:09 -0300
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 17:01:30 +0200
commitcb601d7e65f497a2a172d65b2ef1d738ac6fe4f4 (patch)
treeb1a1a7543dfbf295dc65feed9bb87bb713b7162f /net
parentcad8f1d072375a550ca81419799ba381118c14bb (diff)
downloadlinux-cb601d7e65f497a2a172d65b2ef1d738ac6fe4f4.tar.bz2
Bluetooth: Use GFP_KERNEL in hci_conn_add()
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>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_conn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index eae7a53467ef..9ec7b8efae50 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -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;