D48482.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D48482.diff
View Options

	diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
	--- a/sys/dev/sound/pcm/sound.c
	+++ b/sys/dev/sound/pcm/sound.c
	@@ -136,9 +136,9 @@
	struct snddev_info *d = device_get_softc(dev);
	struct pcm_channel *ch;

	- PCM_BUSYASSERT(d);
	-
	PCM_LOCK(d);
	+ PCM_WAIT(d);
	+ PCM_ACQUIRE(d);
	ch = chn_init(d, NULL, cls, dir, devinfo);
	if (!ch) {
	device_printf(d->dev, "chn_init(%s, %d, %p) failed\n",
	@@ -146,6 +146,7 @@
	PCM_UNLOCK(d);
	return (ENODEV);
	}
	+ PCM_RELEASE(d);
	PCM_UNLOCK(d);

	return (0);
	@@ -388,7 +389,6 @@
	d->dev = dev;
	d->lock = snd_mtxcreate(device_get_nameunit(dev), "sound cdev");
	cv_init(&d->cv, device_get_nameunit(dev));
	- PCM_ACQUIRE_QUICK(d);

	i = 0;
	if (resource_int_value(device_get_name(dev), device_get_unit(dev),
	@@ -428,8 +428,6 @@
	if (d->flags & SD_F_REGISTERED)
	return (EINVAL);

	- PCM_BUSYASSERT(d);
	-
	if (d->playcount == 0 \|\| d->reccount == 0)
	d->flags \|= SD_F_SIMPLEX;

	@@ -442,17 +440,10 @@
	d->flags \|= SD_F_RVCHANS;

	strlcpy(d->status, str, SND_STATUSLEN);
	- sndstat_register(dev, d->status);
	-
	- PCM_LOCK(d);

	/* Done, we're ready.. */
	d->flags \|= SD_F_REGISTERED;

	- PCM_RELEASE(d);
	-
	- PCM_UNLOCK(d);
	-
	/*
	* Create all sysctls once SD_F_REGISTERED is set else
	* tunable sysctls won't work:
	@@ -466,6 +457,8 @@
	else if (snd_unit_auto == 1)
	snd_unit = pcm_best_unit(snd_unit);

	+ sndstat_register(dev, d->status);
	+
	return (dsp_make_dev(dev));
	}