--- src/sys/dev/sound/pci/maestro.c	2007/01/04 21:47:02	1.9
+++ src/sys/dev/sound/pci/maestro.c	2007/06/16 20:07:19	1.10
@@ -161,7 +161,7 @@ struct agg_info {
 
 	/* FreeBSD SMPng related */
 #ifdef USING_MUTEX
-	struct spinlock		*lock;	/* mutual exclusion */
+	sndlock_t		lock;
 #endif
 	/* FreeBSD newpcm related */
 	struct ac97_info	*codec;
@@ -288,7 +288,7 @@ agg_sleep(struct agg_info *sc, const cha
 	if (timo == 0)
 		timo = 1;
 #ifdef USING_MUTEX
-	msleep(sc, sc->lock, 0, wmesg, timo);
+	snd_mtxsleep(sc, sc->lock, 0, wmesg, timo);
 #else
 	tsleep(sc, PWAIT, wmesg, timo);
 #endif