View | Details | Raw Unified | Return to bug 262671 | Differences between
and this patch

Collapse All | Expand All

(-)b/sys/dev/sound/pcm/mixer.c (-5 / +5 lines)
Lines 153-159 mixer_set_softpcmvol(struct snd_mixer *m, struct snddev_info *d, Link Here
153
	struct pcm_channel *c;
153
	struct pcm_channel *c;
154
	int dropmtx, acquiremtx;
154
	int dropmtx, acquiremtx;
155
155
156
	if (PCM_DETACHING(d) || !PCM_REGISTERED(d))
156
	if (!PCM_REGISTERED(d) || PCM_DETACHING(d))
157
		return (EINVAL);
157
		return (EINVAL);
158
158
159
	if (mtx_owned(m->lock))
159
	if (mtx_owned(m->lock))
Lines 206-212 mixer_set_eq(struct snd_mixer *m, struct snddev_info *d, Link Here
206
	else
206
	else
207
		return (EINVAL);
207
		return (EINVAL);
208
208
209
	if (PCM_DETACHING(d) || !PCM_REGISTERED(d))
209
	if (!PCM_REGISTERED(d) || PCM_DETACHING(d))
210
		return (EINVAL);
210
		return (EINVAL);
211
211
212
	if (mtx_owned(m->lock))
212
	if (mtx_owned(m->lock))
Lines 1083-1089 mixer_open(struct cdev *i_dev, int flags, int mode, struct thread *td) Link Here
1083
1083
1084
	m = i_dev->si_drv1;
1084
	m = i_dev->si_drv1;
1085
	d = device_get_softc(m->dev);
1085
	d = device_get_softc(m->dev);
1086
	if (PCM_DETACHING(d) || !PCM_REGISTERED(d))
1086
	if (!PCM_REGISTERED(d) || PCM_DETACHING(d))
1087
		return (EBADF);
1087
		return (EBADF);
1088
1088
1089
	/* XXX Need Giant magic entry ??? */
1089
	/* XXX Need Giant magic entry ??? */
Lines 1239-1245 mixer_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, Link Here
1239
		return (EBADF);
1239
		return (EBADF);
1240
1240
1241
	d = device_get_softc(((struct snd_mixer *)i_dev->si_drv1)->dev);
1241
	d = device_get_softc(((struct snd_mixer *)i_dev->si_drv1)->dev);
1242
	if (PCM_DETACHING(d) || !PCM_REGISTERED(d))
1242
	if (!PCM_REGISTERED(d) || PCM_DETACHING(d))
1243
		return (EBADF);
1243
		return (EBADF);
1244
1244
1245
	PCM_GIANT_ENTER(d);
1245
	PCM_GIANT_ENTER(d);
Lines 1460-1466 mixer_oss_mixerinfo(struct cdev *i_dev, oss_mixerinfo *mi) Link Here
1460
	for (i = 0; pcm_devclass != NULL &&
1460
	for (i = 0; pcm_devclass != NULL &&
1461
	    i < devclass_get_maxunit(pcm_devclass); i++) {
1461
	    i < devclass_get_maxunit(pcm_devclass); i++) {
1462
		d = devclass_get_softc(pcm_devclass, i);
1462
		d = devclass_get_softc(pcm_devclass, i);
1463
		if (PCM_DETACHING(d) || !PCM_REGISTERED(d))
1463
		if (!PCM_REGISTERED(d) || PCM_DETACHING(d))
1464
			continue;
1464
			continue;
1465
1465
1466
		/* XXX Need Giant magic entry */
1466
		/* XXX Need Giant magic entry */

Return to bug 262671