Commit 7c733587 authored Mar 07, 2011 by Clemens Ladisch Committed by Takashi Iwai Mar 08, 2011

ALSA: control: fix numid conflict check for new controls



The purpose of the snd_ctl_hole_check() function is to find conflicts
between the numerical IDs of the new control and those of any existing
controls.  However, it would fail to detect an existing control whose
count is smaller than the new control's count and whose interval of IDs
is entirely contained in the interval of the new control's IDs.

To fix this, use the correct formula to detect overlapping intervals,
which happens to simplify the condition.

This problem was not encountered so far because ALSA does not yet allow
drivers to allocate specific control IDs.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent bdd3255d

sound/core/control.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -285,10 +285,8 @@ static unsigned int snd_ctl_hole_check(struct snd_card *card,
		struct snd_kcontrol *kctl;

		list_for_each_entry(kctl, &card->controls, list) {
		if ((kctl->id.numid <= card->last_numid &&
		kctl->id.numid + kctl->count > card->last_numid) \|\|
		(kctl->id.numid <= card->last_numid + count - 1 &&
		kctl->id.numid + kctl->count > card->last_numid + count - 1))
		if (kctl->id.numid < card->last_numid + 1 + count &&
		kctl->id.numid + kctl->count > card->last_numid + 1)
		return card->last_numid = kctl->id.numid + kctl->count - 1;
		}
		return card->last_numid;

Admin message