]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Bluetooth: Use GFP_KERNEL in sco_conn_add
authorClaudio Takahasi <claudio.takahasi@openbossa.org>
Thu, 11 Apr 2013 14:35:45 +0000 (11:35 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Thu, 11 Apr 2013 19:34:17 +0000 (16:34 -0300)
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>
net/bluetooth/sco.c

index 9909eec6afe3b289e63b2288079d2b123c08760d..18e3594f238c5ee81a54b568b3d9b53d73c9a621 100644 (file)
@@ -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;