Merge tag 'jg-20061012-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...

[karo-tx-linux.git] / sound / pci / emu10k1 / emu10k1_main.c

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 79f24cdf5fbf0b121b6c7564325d8983e89e86d1..8058059c56e9b70ebc716196d996b45a0ea0af6b 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -927,6 +927,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
         .ca0151_chip = 1,
         .spk71 = 1,
         .spdif_bug = 1,
+        .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
         .driver = "Audigy2", .name = "Audigy 2 EX [1005]", 
@@ -1460,8 +1461,8 @@ void snd_emu10k1_resume_regs(struct snd_emu10k1 *emu)
 
        /* resore for spdif */
        if (emu->audigy)
-               outl(emu->port + A_IOCFG, emu->saved_a_iocfg);
-       outl(emu->port + HCFG, emu->saved_hcfg);
+               outl(emu->saved_a_iocfg, emu->port + A_IOCFG);
+       outl(emu->saved_hcfg, emu->port + HCFG);
 
        val = emu->saved_ptr;
        for (reg = saved_regs; *reg != 0xff; reg++)