diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-08-20 05:03:44 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-23 00:26:46 +0200 |
| commit | 57cf9d4512c86a4a1b58857ca22b18bffbfd6812 (patch) | |
| tree | 32c9def6f396c0c5119f70e3735067264c421e73 /sound/soc | |
| parent | sound/soc/fsl/fsl_dma.c: add missing of_node_put (diff) | |
| download | linux-57cf9d4512c86a4a1b58857ca22b18bffbfd6812.tar.xz linux-57cf9d4512c86a4a1b58857ca22b18bffbfd6812.zip | |
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 83ad8ca27490..b085d8e87574 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; |