aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2013-04-11 11:35:45 -0300
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-04-11 16:34:17 -0300
commitc10cc5a9d46ba09111d4c2769207da4a80506885 (patch)
tree709d404a0f92688b835667b046c19d5aa048fd99 /net
parentea323c119823b48b0a66e48fb980c252e1605b3f (diff)
downloadkernel_goldelico_gta04-c10cc5a9d46ba09111d4c2769207da4a80506885.zip
kernel_goldelico_gta04-c10cc5a9d46ba09111d4c2769207da4a80506885.tar.gz
kernel_goldelico_gta04-c10cc5a9d46ba09111d4c2769207da4a80506885.tar.bz2
Bluetooth: Use GFP_KERNEL in sco_conn_add
This patch changes the memory allocation flags in the sco_conn_add function, replacing the type to GFP_KERNEL. This function is executed in process context and it is not called inside an atomic section. Signed-off-by: Claudio Takahasi <claudio.takahasi@openbossa.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/sco.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 9909eec..18e3594 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -83,7 +83,7 @@ static struct sco_conn *sco_conn_add(struct hci_conn *hcon)
if (conn)
return conn;
- conn = kzalloc(sizeof(struct sco_conn), GFP_ATOMIC);
+ conn = kzalloc(sizeof(struct sco_conn), GFP_KERNEL);
if (!conn)
return NULL;