diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-01-07 20:51:39 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-01-07 20:51:39 +0300 |
commit | 7b62275507232f01f66d3e7d05c77bbd9009b726 (patch) | |
tree | 172dd8a7632877df2b623462bc871ab42e093bcc /sound/core | |
parent | 91bc156817a3c2007332b64b4f85c32aafbbbea6 (diff) | |
parent | 1f092d1c8819679d78a7d9c62a46d4939d217a9d (diff) | |
download | linux-7b62275507232f01f66d3e7d05c77bbd9009b726.tar.xz |
Merge tag 'asoc-fix-v5.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.11
A collection of mostly driver specific fixes, plus a maintainership
update for TI and a fix for DAPM driver removal paths.
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/pcm_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index bda3514c7b2d..b7e3d8f44511 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1129,8 +1129,8 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond, if (constrs->rules_num >= constrs->rules_all) { struct snd_pcm_hw_rule *new; unsigned int new_rules = constrs->rules_all + 16; - new = krealloc(constrs->rules, new_rules * sizeof(*c), - GFP_KERNEL); + new = krealloc_array(constrs->rules, new_rules, + sizeof(*c), GFP_KERNEL); if (!new) { va_end(args); return -ENOMEM; |