diff --git a/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c b/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
index 7da033ca19..8fe635f280 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
@@ -205,7 +205,7 @@ auich_stream_commit_parms(auich_stream *stream)
 			LOG(("channel reset finished, %x, %d\n", stream->base, i));
 			break;
 		}
-		snooze(1);
+		spin(1);
 	}
 	
 	if(i < 0) {
@@ -375,7 +375,7 @@ auich_stream_delete(auich_stream *stream)
 			LOG(("channel reset finished, %x, %d\n", stream->base, i));
 			break;
 		}
-		snooze(1);
+		spin(1);
 	}
 	
 	if(i < 0) {
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/io.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/io.c
index 15f8711645..0e7a6aedc1 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/io.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/io.c
@@ -85,7 +85,7 @@ auvia_codec_waitready(device_config *config)
 	/* poll until codec not busy */
 	for(i=0; (i<AUVIA_TIMEOUT) && (pci->read_io_32(config->nabmbar 
 		+ AUVIA_CODEC_CTL) & AUVIA_CODEC_BUSY) ; i++)
-		snooze(1);
+		spin(1);
 	if(i>=AUVIA_TIMEOUT) {
 		//PRINT(("codec busy\n"));
 		return B_ERROR;
@@ -101,7 +101,7 @@ auvia_codec_waitvalid(device_config *config)
 	/* poll until codec valid */
 	for(i=0; (i<AUVIA_TIMEOUT) && !(pci->read_io_32(config->nabmbar 
 		+ AUVIA_CODEC_CTL) & AUVIA_CODEC_PRIVALID) ; i++)
-		snooze(1);
+		spin(1);
 	if(i>=AUVIA_TIMEOUT) {
 		//PRINT(("codec invalid\n"));
 		return B_ERROR;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/es1370/io.c b/src/add-ons/kernel/drivers/audio/ac97/es1370/io.c
index 0214fbbab1..f7617c545b 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/es1370/io.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/es1370/io.c
@@ -68,7 +68,7 @@ es1370_codec_wait(device_config *config)
 		if ((es1370_reg_read_32(config, ES1370_REG_STATUS) & STAT_CWRIP) == 0)
 			return B_OK;
 		if (i > 100)
-			snooze(1);
+			spin(1);
 	}
 	return B_TIMED_OUT;
 }
diff --git a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
index 11923a0e40..8bb38525b4 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
+++ b/src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
@@ -96,7 +96,7 @@ dump_hardware_regs(device_config *config)
 	LOG(("EMU_IPR = %#08x\n",emuxki_reg_read_32(config, EMU_IPR)));
 	LOG(("EMU_INTE = %#08x\n",emuxki_reg_read_32(config, EMU_INTE)));
 	LOG(("EMU_HCFG = %#08x\n",emuxki_reg_read_32(config, EMU_HCFG)));
-	snooze(100);	
+	snooze(1000);	
 	/*emuxki_reg_write_8(config, EMU_AC97ADDRESS, EMU_AC97ADDRESS_READY);
 	LOG(("EMU_AC97ADDRESS_READY = %#08x\n", emuxki_reg_read_16(config, EMU_AC97DATA)));*/