D45135.id138272.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45135.id138272.diff
View Options

	diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
	--- a/sys/dev/sound/pcm/mixer.c
	+++ b/sys/dev/sound/pcm/mixer.c
	@@ -1431,7 +1431,7 @@
	{
	struct snddev_info *d;
	struct snd_mixer *m;
	- int nmix, i;
	+ int i;

	/*
	* If probing the device handling the ioctl, make sure it's a mixer
	@@ -1442,7 +1442,6 @@

	d = NULL;
	m = NULL;
	- nmix = 0;

	/*
	* There's a 1:1 relationship between mixers and PCM devices, so
	@@ -1462,7 +1461,7 @@

	if (d->mixer_dev != NULL && d->mixer_dev->si_drv1 != NULL &&
	((mi->dev == -1 && d->mixer_dev == i_dev) \|\|
	- mi->dev == nmix)) {
	+ mi->dev == i)) {
	m = d->mixer_dev->si_drv1;
	mtx_lock(m->lock);

	@@ -1474,7 +1473,7 @@
	* sure to unlock when existing.
	*/
	bzero((void )mi, sizeof(mi));
	- mi->dev = nmix;
	+ mi->dev = i;
	snprintf(mi->id, sizeof(mi->id), "mixer%d", i);
	strlcpy(mi->name, m->name, sizeof(mi->name));
	mi->modify_counter = m->modify_counter;
	@@ -1538,8 +1537,7 @@
	mi->legacy_device = i;
	*/
	mtx_unlock(m->lock);
	- } else
	- ++nmix;
	+ }

	PCM_UNLOCK(d);