Skip to content

Commit 65243c7

Browse files
ossilatortiwai
authored andcommitted
ALSA: emu10k1: skip Sound Blaster-specific hacks for E-MU cards
The rev2 cards use CA0108, but the embedded P17V goes entirely unused. Also, A_IOCTL (which is really the GPIO port) is actually the FPGA control port, so messing with it is no good idea. The hacks are actually mutually exclusive, so make that explicit while we're at it. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Link: https://lore.kernel.org/r/20230422161021.1143888-1-oswald.buddenhagen@gmx.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 2696d5a commit 65243c7

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

sound/pci/emu10k1/emu10k1_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir)
183183
snd_emu10k1_ptr_write(emu, SPCS1, 0, emu->spdif_bits[1]);
184184
snd_emu10k1_ptr_write(emu, SPCS2, 0, emu->spdif_bits[2]);
185185

186-
if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
186+
if (emu->card_capabilities->emu_model) {
187+
} else if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
187188
/* Hacks for Alice3 to work independent of haP16V driver */
188189
/* Setup SRCMulti_I2S SamplingRate */
189190
tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
@@ -201,8 +202,7 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir)
201202
outl(0x0201, emu->port + HCFG2);
202203
/* Set playback routing. */
203204
snd_emu10k1_ptr20_write(emu, CAPTURE_P16V_SOURCE, 0, 0x78e4);
204-
}
205-
if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
205+
} else if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
206206
/* Hacks for Alice3 to work independent of haP16V driver */
207207
dev_info(emu->card->dev, "Audigy2 value: Special config.\n");
208208
/* Setup SRCMulti_I2S SamplingRate */

0 commit comments

Comments
 (0)