From: Claudio Takahasi <claudio.takahasi@openbossa.org>
Date: Thu, 11 Apr 2013 14:35:45 +0000 (-0300)
Subject: Bluetooth: Use GFP_KERNEL in sco_conn_add
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c10cc5a9d46ba09111d4c2769207da4a80506885;p=openwrt%2Fstaging%2Fblogic.git

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>
---

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 9909eec6afe3..18e3594f238c 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;