From: Axel Lin <axel.lin@gmail.com>
Date: Sat, 20 Aug 2011 03:03:44 +0000 (+0800)
Subject: ASoC: soc-core: use GFP_KERNEL flag for kmalloc in snd_soc_cnew
X-Git-Tag: v3.1-rc9~2^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57cf9d4512c86a4a1b58857ca22b18bffbfd6812;p=platform%2Fkernel%2Flinux-stable.git

ASoC: soc-core: use GFP_KERNEL flag for kmalloc in snd_soc_cnew

GFP_ATOMIC is not needed here, use GFP_KERNEL instead.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 83ad8ca..b085d8e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1913,7 +1913,7 @@ struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,
 
 	if (prefix) {
 		name_len = strlen(long_name) + strlen(prefix) + 2;
-		name = kmalloc(name_len, GFP_ATOMIC);
+		name = kmalloc(name_len, GFP_KERNEL);
 		if (!name)
 			return NULL;