Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F167482309
D59077.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
594 B
Referenced Files
None
Subscribers
None
D59077.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
@@ -519,8 +519,6 @@
mixer_delete(struct snd_mixer *m)
{
KASSERT(m != NULL, ("NULL snd_mixer"));
- KASSERT(m->type == MIXER_TYPE_SECONDARY,
- ("%s(): illegal mixer type=%d", __func__, m->type));
/* mixer uninit can sleep --hps */
@@ -633,11 +631,7 @@
/* mixer uninit can sleep --hps */
- MIXER_UNINIT(m);
-
- if (m->type == MIXER_TYPE_SECONDARY)
- mtx_destroy(m->lock);
- kobj_delete((kobj_t)m, M_DEVBUF);
+ mixer_delete(m);
return 0;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Aug 23, 3:30 AM (17 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37083293
Default Alt Text
D59077.diff (594 B)
Attached To
Mode
D59077: sound: Reuse mixer_delete() in mixer_uninit()
Attached
Detach File
Event Timeline
Log In to Comment