diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 23:33:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 23:33:01 +0100 |
| commit | 09d930ae5198fbb67b86d3d058ad82211f469a46 (patch) | |
| tree | e11f0be409e9184a0764263116a72dc0100aaaa8 /sound/soc/soc-core.c | |
| parent | 33c5f969b969c277e96cd9e9bf8472c4b8709c25 (diff) | |
| parent | c09f5ca7bdc9a82c5f721bc28c46d65452240cfa (diff) | |
| download | op-kernel-dev-09d930ae5198fbb67b86d3d058ad82211f469a46.zip op-kernel-dev-09d930ae5198fbb67b86d3d058ad82211f469a46.tar.gz | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/soc-core.c')
| -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 f8f985a..fd173f6 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1915,7 +1915,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; |
