diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-13 21:52:23 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-13 21:52:23 +0300 |
| commit | 673f45f7bf7dbb6801a04053e3e2d13dfa42db08 (patch) | |
| tree | 1eaca68ae7681a38d63ba780f858f9ea3813c43d /sound/soc/codecs/wm_adsp.c | |
| parent | bd2b34e485f2361655c6020aa2d3bf2a14ae9dff (diff) | |
| parent | 1a0f2433d7380c957d5d29e60a2eeb03ca3afe21 (diff) | |
| download | linux-673f45f7bf7dbb6801a04053e3e2d13dfa42db08.tar.xz | |
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
Diffstat (limited to 'sound/soc/codecs/wm_adsp.c')
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index d3d32b501aca..ffb9836e0538 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1436,12 +1436,12 @@ static int wm_adsp_create_control(struct wm_adsp *dsp, subname = NULL; /* don't append subname */ break; case 2: - ret = snprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, + ret = scnprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s%c %.12s %x", dsp->name, *region_name, wm_adsp_fw_text[dsp->fw], alg_region->alg); break; default: - ret = snprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, + ret = scnprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s %.12s %x", dsp->name, wm_adsp_fw_text[dsp->fw], alg_region->alg); break; |