aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/emufx.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/emu10k1/emufx.c')
-rw-r--r--sound/pci/emu10k1/emufx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 354a892adb40..71dc4c8865b8 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -1261,7 +1261,7 @@ static int __devinit _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)
1261A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) 1261A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
1262 1262
1263 /* emu1212 DSP 0 and DSP 1 Capture */ 1263 /* emu1212 DSP 0 and DSP 1 Capture */
1264 if (emu->card_capabilities->emu1010) { 1264 if (emu->card_capabilities->emu_model) {
1265 if (emu->card_capabilities->ca0108_chip) { 1265 if (emu->card_capabilities->ca0108_chip) {
1266 /* Note:JCD:No longer bit shift lower 16bits to upper 16bits of 32bit value. */ 1266 /* Note:JCD:No longer bit shift lower 16bits to upper 16bits of 32bit value. */
1267 A_OP(icode, &ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A3_EMU32IN(0x0), A_C_00000001); 1267 A_OP(icode, &ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A3_EMU32IN(0x0), A_C_00000001);
@@ -1515,7 +1515,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
1515 1515
1516 /* digital outputs */ 1516 /* digital outputs */
1517 /* A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS); */ 1517 /* A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS); */
1518 if (emu->card_capabilities->emu1010) { 1518 if (emu->card_capabilities->emu_model) {
1519 /* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */ 1519 /* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */
1520 snd_printk("EMU outputs on\n"); 1520 snd_printk("EMU outputs on\n");
1521 for (z = 0; z < 8; z++) { 1521 for (z = 0; z < 8; z++) {
@@ -1563,7 +1563,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
1563 A_PUT_OUTPUT(A_EXTOUT_ADC_CAP_R, capture+1); 1563 A_PUT_OUTPUT(A_EXTOUT_ADC_CAP_R, capture+1);
1564#endif 1564#endif
1565 1565
1566 if (emu->card_capabilities->emu1010) { 1566 if (emu->card_capabilities->emu_model) {
1567 if (emu->card_capabilities->ca0108_chip) { 1567 if (emu->card_capabilities->ca0108_chip) {
1568 snd_printk("EMU2 inputs on\n"); 1568 snd_printk("EMU2 inputs on\n");
1569 for (z = 0; z < 0x10; z++) { 1569 for (z = 0; z < 0x10; z++) {