Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09b9ddfa authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcm: Use krealloc() for resizing the rules array 



Just a minor simplification.  Change from kcalloc() shouldn't matter
as each array element is fully initialized.

Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5730f9f7

sound/core/pcm_lib.c

+2 −6
Original line number Diff line number Diff line
@@ -1129,16 +1129,12 @@ 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 = kcalloc(new_rules, sizeof(*c), GFP_KERNEL);

		new = krealloc(constrs->rules, new_rules * sizeof(*c),

			       GFP_KERNEL);

		if (!new) {

			va_end(args);

			return -ENOMEM;

		}

		if (constrs->rules) {

			memcpy(new, constrs->rules,

			       constrs->rules_num * sizeof(*c));

			kfree(constrs->rules);

		}

		constrs->rules = new;

		constrs->rules_all = new_rules;

	}