--- sys/dev/sound/pcm/sndstat.c.orig	Mon Feb 28 07:14:23 2005
+++ sys/dev/sound/pcm/sndstat.c	Tue Sep 13 16:10:32 2005
@@ -368,6 +368,7 @@
 	sndstat_dev = 0;
 
 	splx(s);
+	sx_xunlock(&sndstat_lock);
 	sx_destroy(&sndstat_lock);
 	return 0;
 }
@@ -387,7 +388,10 @@
 static void
 sndstat_sysuninit(void *p)
 {
-	sndstat_uninit();
+	int error;
+
+	error = sndstat_uninit();
+	KASSERT(error == 0, ("%s: error = %d", __func__, error));
 }
 
 SYSINIT(sndstat_sysinit, SI_SUB_DRIVERS, SI_ORDER_FIRST, sndstat_sysinit, NULL);