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

• Lines: 56
• Date: Tue Sep 5 21:50:50 2000
• Orig file: v2.2.17/drivers/sound/emu10k1/cardwi.c
• Orig date: Sat Sep 9 18:42:43 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/sound/emu10k1/cardwi.c linux/drivers/sound/emu10k1/cardwi.c
@@ -67,20 +67,9 @@
 
 		break;
 
+	/* these can't be changed from the original values */
 	case WAVERECORD_MIC:
-		wave_fmt->channels = 1;
-		wave_fmt->samplingrate = 0x1F40;
-		wave_fmt->bitsperchannel = 16;
-		break;
-
 	case WAVERECORD_FX:
-		if (wave_fmt->channels > 16)
-			wave_fmt->channels = 16;
-		else if (wave_fmt->channels < 1)
-			wave_fmt->channels = 1;
-
-		wave_fmt->samplingrate = 0xBB80;
-		wave_fmt->bitsperchannel = 16;
 		break;
 
 	default:
@@ -123,13 +112,13 @@
 
 	switch (wiinst->recsrc) {
 	case WAVERECORD_AC97:
-		wiinst_tmp = &card->wavein->ac97;
+		wiinst_tmp = &card->wavein.ac97;
 		break;
 	case WAVERECORD_MIC:
-		wiinst_tmp = &card->wavein->mic;
+		wiinst_tmp = &card->wavein.mic;
 		break;
 	case WAVERECORD_FX:
-		wiinst_tmp = &card->wavein->fx;
+		wiinst_tmp = &card->wavein.fx;
 		break;
 	default:
 		BUG();
@@ -191,13 +180,13 @@
 	spin_lock_irqsave(&card->lock, flags);
 	switch (wave_dev->wiinst->recsrc) {
 	case WAVERECORD_AC97:
-		card->wavein->ac97 = NULL;
+		card->wavein.ac97 = NULL;
 		break;
 	case WAVERECORD_MIC:
-		card->wavein->mic = NULL;
+		card->wavein.mic = NULL;
 		break;
 	case WAVERECORD_FX:
-		card->wavein->fx = NULL;
+		card->wavein.fx = NULL;
 		break;
 	default:
 		BUG();