summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_conn.c
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2012-01-30 09:22:10 -0300
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 17:01:30 +0200
commit75d7735c7a3ddc3842473219460285748d10db11 (patch)
treefad858e61a75f917f767554f8f14e0e3a57960df /net/bluetooth/hci_conn.c
parentcb601d7e65f497a2a172d65b2ef1d738ac6fe4f4 (diff)
downloadblackbird-op-linux-75d7735c7a3ddc3842473219460285748d10db11.tar.gz
blackbird-op-linux-75d7735c7a3ddc3842473219460285748d10db11.zip
Bluetooth: Use GFP_KERNEL in hci_chan_create()
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/bluetooth/hci_conn.c')
-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 9ec7b8efae50..7b38a0ba8765 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -945,7 +945,7 @@ struct hci_chan *hci_chan_create(struct hci_conn *conn)
BT_DBG("%s conn %p", hdev->name, conn);
- chan = kzalloc(sizeof(struct hci_chan), GFP_ATOMIC);
+ chan = kzalloc(sizeof(struct hci_chan), GFP_KERNEL);
if (!chan)
return NULL;
OpenPOWER on IntegriCloud