patch-2.2.18 linux/drivers/sound/emu10k1/recmgr.c

Next file: linux/drivers/sound/emu10k1/voicemgr.c
Previous file: linux/drivers/sound/emu10k1/mixer.c
Back to the patch index
Back to the overall index

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/sound/emu10k1/recmgr.c linux/drivers/sound/emu10k1/recmgr.c
@@ -36,9 +36,6 @@
 {
 	DPF(2, "emu10k1_start_record()\n");
 
-	if(buffer->fxwc)
-		sblive_writeptr(card, FXWC, 0, buffer->fxwc);
-
 	sblive_writeptr(card, buffer->sizereg, 0, buffer->sizeregval);
 
 	if (buffer->adcctl)
@@ -109,8 +106,6 @@
 		if (wiinst->format.channels == 2)
 			buffer->adcctl |= ADCCR_RCHANENABLE;
 
-			buffer->fxwc = 0;
-
 		break;
 
 	case WAVERECORD_MIC:
@@ -119,7 +114,6 @@
 		buffer->addrreg = MICBA;
 		buffer->idxreg = MICIDX_IDX;
 		buffer->adcctl = 0;
-		buffer->fxwc = 0;
 		break;
 
 	case WAVERECORD_FX:
@@ -128,7 +122,8 @@
 		buffer->addrreg = FXBA;
 		buffer->idxreg = FXIDX_IDX;
 		buffer->adcctl = 0;
-		buffer->fxwc = 0x0001;
+
+		sblive_writeptr(card, FXWC, 0, wiinst->fxwc);
 		break;
 	default:
 		BUG();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)