diff options
| author | Andre Guedes <aguedespe@gmail.com> | 2012-06-07 19:05:45 -0300 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-19 00:53:37 -0300 |
| commit | 12b9456502d421a8272615fb641349eb2013b6d8 (patch) | |
| tree | 520cbb58cb915faac60f26eaee85243079c5b5b1 /net | |
| parent | 92c4c2049762dc0ef2b152df8c787051db1cdf60 (diff) | |
| download | op-kernel-dev-12b9456502d421a8272615fb641349eb2013b6d8.zip op-kernel-dev-12b9456502d421a8272615fb641349eb2013b6d8.tar.gz | |
Bluetooth: Use GFP_KERNEL in mgmt_pending_add
We are allowed to sleep in mgmt_pending_add, so we should use
GFP_KERNEL for memory allocations instead of GFP_ATOMIC.
Signed-off-by: Andre Guedes <aguedespe@gmail.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 86590c65..41b5192 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -687,14 +687,14 @@ static struct pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode, { struct pending_cmd *cmd; - cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC); + cmd = kmalloc(sizeof(*cmd), GFP_KERNEL); if (!cmd) return NULL; cmd->opcode = opcode; cmd->index = hdev->id; - cmd->param = kmalloc(len, GFP_ATOMIC); + cmd->param = kmalloc(len, GFP_KERNEL); if (!cmd->param) { kfree(cmd); return NULL; |
