diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-15 11:20:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-15 11:20:08 +0100 |
| commit | 514918f0d1c3e7cf78fe2acbe80f7b616065e210 (patch) | |
| tree | f6a918d115acf0347ee69b2b90aada657a68ef96 /sound/soc/soc-core.c | |
| parent | Merge remote-tracking branch 'asoc/fix/dma' into asoc-linus (diff) | |
| parent | ASoC: fsl: imx-pcm-fiq: omit fiq counter to avoid harm in unbalanced situations (diff) | |
| download | linux-514918f0d1c3e7cf78fe2acbe80f7b616065e210.tar.xz linux-514918f0d1c3e7cf78fe2acbe80f7b616065e210.zip | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index afc3fa8b7470..bdc1d74eb7b0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2551,8 +2551,9 @@ int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol, if (uinfo->value.enumerated.item > e->max - 1) uinfo->value.enumerated.item = e->max - 1; - strcpy(uinfo->value.enumerated.name, - e->texts[uinfo->value.enumerated.item]); + strlcpy(uinfo->value.enumerated.name, + e->texts[uinfo->value.enumerated.item], + sizeof(uinfo->value.enumerated.name)); return 0; } EXPORT_SYMBOL_GPL(snd_soc_info_enum_double); |