Merge branch 'topic/fix/misc' into topic/misc
Takashi Iwai [Fri, 7 Nov 2008 08:06:05 +0000 (09:06 +0100)]
1  2 
sound/pci/emu10k1/emu10k1_main.c

@@@ -69,7 -69,7 +69,7 @@@ MODULE_FIRMWARE(EMU1010_NOTEBOOK_FILENA
   * EMU10K1 init / done
   *************************************************************************/
  
 -void snd_emu10k1_voice_init(struct snd_emu10k1 * emu, int ch)
 +void snd_emu10k1_voice_init(struct snd_emu10k1 *emu, int ch)
  {
        snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0);
        snd_emu10k1_ptr_write(emu, IP, ch, 0);
@@@ -151,9 -151,9 +151,9 @@@ static unsigned int i2c_adc_init[][2] 
        { 0x12, 0x32 },  /* ALC Control 3 */
        { 0x13, 0x00 },  /* Noise gate control */
        { 0x14, 0xa6 },  /* Limiter control */
 -      { 0x15, ADC_MUX_2 },  /* ADC Mixer control. Mic for Audigy 2 ZS Notebook */
 +      { 0x15, ADC_MUX_2 },  /* ADC Mixer control. Mic for A2ZS Notebook */
  };
 -      
 +
  static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
  {
        unsigned int silent_page;
        u32 tmp;
  
        /* disable audio and lock cache */
 -      outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK | HCFG_MUTEBUTTONENABLE,
 -           emu->port + HCFG);
 +      outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK |
 +              HCFG_MUTEBUTTONENABLE, emu->port + HCFG);
  
        /* reset recording buffers */
        snd_emu10k1_ptr_write(emu, MICBS, 0, ADCBS_BUFSIZE_NONE);
        snd_emu10k1_ptr_write(emu, SOLEL, 0, 0);
        snd_emu10k1_ptr_write(emu, SOLEH, 0, 0);
  
 -      if (emu->audigy){
 +      if (emu->audigy) {
                /* set SPDIF bypass mode */
                snd_emu10k1_ptr_write(emu, SPBYPASS, 0, SPBYPASS_FORMAT);
                /* enable rear left + rear right AC97 slots */
  
        if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
                /* Hacks for Alice3 to work independent of haP16V driver */
 -              //Setup SRCMulti_I2S SamplingRate
 +              /* Setup SRCMulti_I2S SamplingRate */
                tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
                tmp &= 0xfffff1ff;
                tmp |= (0x2<<9);
                snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, 0, tmp);
 -              
 +
                /* Setup SRCSel (Enable Spdif,I2S SRCMulti) */
                snd_emu10k1_ptr20_write(emu, SRCSel, 0, 0x14);
                /* Setup SRCMulti Input Audio Enable */
        if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
                /* Hacks for Alice3 to work independent of haP16V driver */
                snd_printk(KERN_INFO "Audigy2 value: Special config.\n");
 -              //Setup SRCMulti_I2S SamplingRate
 +              /* Setup SRCMulti_I2S SamplingRate */
                tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
                tmp &= 0xfffff1ff;
                tmp |= (0x2<<9);
                size = ARRAY_SIZE(i2c_adc_init);
                for (n = 0; n < size; n++)
                        snd_emu10k1_i2c_write(emu, i2c_adc_init[n][0], i2c_adc_init[n][1]);
 -              for (n=0; n < 4; n++) {
 -                      emu->i2c_capture_volume[n][0]= 0xcf;
 -                      emu->i2c_capture_volume[n][1]= 0xcf;
 +              for (n = 0; n < 4; n++) {
 +                      emu->i2c_capture_volume[n][0] = 0xcf;
 +                      emu->i2c_capture_volume[n][1] = 0xcf;
                }
        }
  
 -      
 +
        snd_emu10k1_ptr_write(emu, PTB, 0, emu->ptb_pages.addr);
        snd_emu10k1_ptr_write(emu, TCB, 0, 0);  /* taken from original driver */
        snd_emu10k1_ptr_write(emu, TCBS, 0, 4); /* taken from original driver */
            (emu->model == 0x21 && emu->revision < 6))
                outl(HCFG_LOCKTANKCACHE_MASK | HCFG_AUTOMUTE, emu->port + HCFG);
        else
 -              // With on-chip joystick
 +              /* With on-chip joystick */
                outl(HCFG_LOCKTANKCACHE_MASK | HCFG_AUTOMUTE | HCFG_JOYENABLE, emu->port + HCFG);
  
        if (enable_ir) {        /* enable IR for SB Live */
                        outl(reg | HCFG_GPOUT1 | HCFG_GPOUT2, emu->port + HCFG);
                        udelay(100);
                        outl(reg, emu->port + HCFG);
 -              }
 +              }
        }
 -      
 +
        if (emu->card_capabilities->emu_model) {
                ;  /* Disable all access to A_IOCFG for the emu1010 */
        } else if (emu->card_capabilities->i2c_adc) {
@@@ -364,7 -364,7 +364,7 @@@ static void snd_emu10k1_audio_enable(st
                ;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */
        } else if (emu->audigy) {
                outl(inl(emu->port + A_IOCFG) & ~0x44, emu->port + A_IOCFG);
 - 
 +
                if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
                        /* Unmute Analog now.  Set GPO6 to 1 for Apollo.
                         * This has to be done after init ALice3 I2SOut beyond 48KHz.
                        outl(inl(emu->port + A_IOCFG) | 0x0080, emu->port + A_IOCFG);
                }
        }
 -      
 +
  #if 0
        {
        unsigned int tmp;
        /* FIXME: the following routine disables LiveDrive-II !! */
 -      // TOSLink detection
 +      /* TOSLink detection */
        emu->tos_link = 0;
        tmp = inl(emu->port + HCFG);
        if (tmp & (HCFG_GPINPUT0 | HCFG_GPINPUT1)) {
        snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE);
  }
  
 -int snd_emu10k1_done(struct snd_emu10k1 * emu)
 +int snd_emu10k1_done(struct snd_emu10k1 *emu)
  {
        int ch;
  
  
  #define EC_LAST_PROMFILE_ADDR 0x2f
  
 -#define EC_SERIALNUM_ADDR     0x30    /* First word of serial number.  The 
 +#define EC_SERIALNUM_ADDR     0x30    /* First word of serial number.  The
                                         * can be up to 30 characters in length
                                         * and is stored as a NULL-terminated
                                         * ASCII string.  Any unused bytes must be
  #define EC_CHECKSUM_ADDR      0x3f    /* Location at which checksum is stored */
  
  
 -/* Most of this stuff is pretty self-evident.  According to the hardware 
 - * dudes, we need to leave the ADCCAL bit low in order to avoid a DC 
 +/* Most of this stuff is pretty self-evident.  According to the hardware
 + * dudes, we need to leave the ADCCAL bit low in order to avoid a DC
   * offset problem.  Weird.
   */
  #define EC_RAW_RUN_MODE               (EC_DACMUTEN | EC_ADCRSTN | EC_TRIM_MUTEN | \
   *  register.
   */
  
 -static void snd_emu10k1_ecard_write(struct snd_emu10k1 * emu, unsigned int value)
 +static void snd_emu10k1_ecard_write(struct snd_emu10k1 *emu, unsigned int value)
  {
        unsigned short count;
        unsigned int data;
   * channel.
   */
  
 -static void snd_emu10k1_ecard_setadcgain(struct snd_emu10k1 * emu,
 +static void snd_emu10k1_ecard_setadcgain(struct snd_emu10k1 *emu,
                                         unsigned short gain)
  {
        unsigned int bit;
  
        for (bit = (1 << 15); bit; bit >>= 1) {
                unsigned int value;
 -              
 +
                value = emu->ecard_ctrl & ~(EC_TRIM_CSN | EC_TRIM_SDATA);
  
                if (gain & bit)
        snd_emu10k1_ecard_write(emu, emu->ecard_ctrl);
  }
  
 -static int snd_emu10k1_ecard_init(struct snd_emu10k1 * emu)
 +static int snd_emu10k1_ecard_init(struct snd_emu10k1 *emu)
  {
        unsigned int hc_value;
  
                          EC_SPDIF0_SELECT(EC_DEFAULT_SPDIF0_SEL) |
                          EC_SPDIF1_SELECT(EC_DEFAULT_SPDIF1_SEL);
  
 -      /* Step 0: Set the codec type in the hardware control register 
 +      /* Step 0: Set the codec type in the hardware control register
         * and enable audio output */
        hc_value = inl(emu->port + HCFG);
        outl(hc_value | HCFG_AUDIOENABLE | HCFG_CODECFORMAT_I2S, emu->port + HCFG);
        return 0;
  }
  
 -static int snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu)
 +static int snd_emu10k1_cardbus_init(struct snd_emu10k1 *emu)
  {
        unsigned long special_port;
        unsigned int value;
        return 0;
  }
  
 -static int snd_emu1010_load_firmware(struct snd_emu10k1 * emu, const char * filename)
 +static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, const char *filename)
  {
        int err;
        int n, i;
        unsigned long flags;
        const struct firmware *fw_entry;
  
 -      if ((err = request_firmware(&fw_entry, filename, &emu->pci->dev)) != 0) {
 -              snd_printk(KERN_ERR "firmware: %s not found. Err=%d\n",filename, err);
 +      err = request_firmware(&fw_entry, filename, &emu->pci->dev);
 +      if (err != 0) {
 +              snd_printk(KERN_ERR "firmware: %s not found. Err = %d\n", filename, err);
                return err;
        }
 -      snd_printk(KERN_INFO "firmware size=0x%zx\n", fw_entry->size);
 +      snd_printk(KERN_INFO "firmware size = 0x%zx\n", fw_entry->size);
  
        /* The FPGA is a Xilinx Spartan IIE XC2S50E */
        /* GPIO7 -> FPGA PGMN
        outl(0x80, emu->port + A_IOCFG); /* Leave bit 7 set during netlist setup. */
        write_post = inl(emu->port + A_IOCFG);
        udelay(100); /* Allow FPGA memory to clean */
 -      for(n = 0; n < fw_entry->size; n++) {
 -              value=fw_entry->data[n];        
 -              for(i = 0; i < 8; i++) {
 +      for (n = 0; n < fw_entry->size; n++) {
 +              value = fw_entry->data[n];
 +              for (i = 0; i < 8; i++) {
                        reg = 0x80;
                        if (value & 0x1)
                                reg = reg | 0x20;
 -                      value = value >> 1;   
 +                      value = value >> 1;
                        outl(reg, emu->port + A_IOCFG);
                        write_post = inl(emu->port + A_IOCFG);
                        outl(reg | 0x40, emu->port + A_IOCFG);
        write_post = inl(emu->port + A_IOCFG);
        spin_unlock_irqrestore(&emu->emu_lock, flags);
  
 -        release_firmware(fw_entry);
 +      release_firmware(fw_entry);
        return 0;
  }
  
  static int emu1010_firmware_thread(void *data)
  {
 -      struct snd_emu10k1 * emu = data;
 -      int tmp,tmp2;
 +      struct snd_emu10k1 *emu = data;
 +      int tmp, tmp2;
        int reg;
        int err;
  
                msleep_interruptible(1000);
                if (kthread_should_stop())
                        break;
 -              snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &tmp ); /* IRQ Status */
 -              snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg ); /* OPTIONS: Which cards are attached to the EMU */
 +              snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &tmp); /* IRQ Status */
 +              snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg); /* OPTIONS: Which cards are attached to the EMU */
                if (reg & EMU_HANA_OPTION_DOCK_OFFLINE) {
                        /* Audio Dock attached */
                        /* Return to Audio Dock programming mode */
                        snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n");
 -                      snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK );
 +                      snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK);
                        if (emu->card_capabilities->emu_model ==
                            EMU_MODEL_EMU1010) {
 -                              if ((err = snd_emu1010_load_firmware(emu, DOCK_FILENAME)) != 0) {
 +                              err = snd_emu1010_load_firmware(emu, DOCK_FILENAME);
 +                              if (err != 0)
                                        continue;
 -                              }
                        } else if (emu->card_capabilities->emu_model ==
                                   EMU_MODEL_EMU1010B) {
 -                              if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {
 +                              err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME);
 +                              if (err != 0)
                                        continue;
 -                              }
                        } else if (emu->card_capabilities->emu_model ==
                                   EMU_MODEL_EMU1616) {
 -                              if ((err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME)) != 0) {
 +                              err = snd_emu1010_load_firmware(emu, MICRO_DOCK_FILENAME);
 +                              if (err != 0)
                                        continue;
 -                              }
                        }
  
 -                      snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, 0 );
 -                      snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg );
 -                      snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS=0x%x\n",reg);
 +                      snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0);
 +                      snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg);
 +                      snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS = 0x%x\n", reg);
                        /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
 -                      snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
 -                      snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_ID=0x%x\n",reg);
 +                      snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
 +                      snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_ID = 0x%x\n", reg);
                        if ((reg & 0x1f) != 0x15) {
                                /* FPGA failed to be programmed */
 -                              snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware file failed, reg=0x%x\n", reg);
 +                              snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware file failed, reg = 0x%x\n", reg);
                                continue;
                        }
                        snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
 -                      snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp );
 -                      snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2 );
 -                      snd_printk("Audio Dock ver:%d.%d\n",tmp ,tmp2);
 +                      snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
 +                      snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
 +                      snd_printk("Audio Dock ver:%d.%d\n", tmp, tmp2);
                        /* Sync clocking between 1010 and Dock */
                        /* Allow DLL to settle */
                        msleep(10);
                        /* Unmute all. Default is muted after a firmware load */
 -                      snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
 +                      snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
                }
        }
        snd_printk(KERN_INFO "emu1010: firmware thread stopping\n");
   *            16 x 16-bit playback - snd_emu10k1_fx8010_playback_ops
   *            16 x 32-bit capture - snd_emu10k1_capture_efx_ops
   */
 -static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
 +static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
  {
        unsigned int i;
 -      int tmp,tmp2;
 +      int tmp, tmp2;
        int reg;
        int err;
        const char *filename = NULL;
         * Lock Tank Memory Cache,
         * Mute all codecs.
         */
 -      outl(0x0005a004, emu->port + HCFG); 
 +      outl(0x0005a004, emu->port + HCFG);
        /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
         * Mute all codecs.
         */
        outl(0x0005a000, emu->port + HCFG);
  
        /* Disable 48Volt power to Audio Dock */
 -      snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  0 );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, 0);
  
        /* ID, should read & 0x7f = 0x55. (Bit 7 is the IRQ bit) */
 -      snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
 -      snd_printdd("reg1=0x%x\n",reg);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
 +      snd_printdd("reg1 = 0x%x\n", reg);
        if ((reg & 0x3f) == 0x15) {
                /* FPGA netlist already present so clear it */
                /* Return to programming mode */
  
 -              snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, 0x02 );
 +              snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0x02);
        }
 -      snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
 -      snd_printdd("reg2=0x%x\n",reg);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
 +      snd_printdd("reg2 = 0x%x\n", reg);
        if ((reg & 0x3f) == 0x15) {
                /* FPGA failed to return to programming mode */
                snd_printk(KERN_INFO "emu1010: FPGA failed to return to programming mode\n");
                return -ENODEV;
        }
 -      snd_printk(KERN_INFO "emu1010: EMU_HANA_ID=0x%x\n",reg);
 +      snd_printk(KERN_INFO "emu1010: EMU_HANA_ID = 0x%x\n", reg);
        switch (emu->card_capabilities->emu_model) {
        case EMU_MODEL_EMU1010:
                filename = HANA_FILENAME;
        }
  
        /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
 -      snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
 +      snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
        if ((reg & 0x3f) != 0x15) {
                /* FPGA failed to be programmed */
 -              snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file failed, reg=0x%x\n", reg);
 +              snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file failed, reg = 0x%x\n", reg);
                return -ENODEV;
        }
  
        snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
 -      snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp );
 -      snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2 );
 -      snd_printk("Hana ver:%d.%d\n",tmp ,tmp2);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
 +      snd_printk("emu1010: Hana version: %d.%d\n", tmp, tmp2);
        /* Enable 48Volt power to Audio Dock */
 -      snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  EMU_HANA_DOCK_PWR_ON );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);
  
 -      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
 -      snd_printk(KERN_INFO "emu1010: Card options=0x%x\n",reg);
 -      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
 -      snd_printk(KERN_INFO "emu1010: Card options=0x%x\n",reg);
 -      snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp ); 
 +      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);
 +      snd_printk(KERN_INFO "emu1010: Card options = 0x%x\n", reg);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);
 +      snd_printk(KERN_INFO "emu1010: Card options = 0x%x\n", reg);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp);
        /* Optical -> ADAT I/O  */
        /* 0 : SPDIF
         * 1 : ADAT
        tmp = 0;
        tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |
                (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);
 -      snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp );
 -      snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &tmp );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &tmp);
        /* Set no attenuation on Audio Dock pads. */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00 );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00);
        emu->emu1010.adc_pads = 0x00;
 -      snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp );
 +      snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp);
        /* Unmute Audio dock DACs, Headphone source DAC-4. */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30 );
 -      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12 );
 -      snd_emu1010_fpga_read(emu, EMU_HANA_DAC_PADS, &tmp );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30);
 +      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_DAC_PADS, &tmp);
        /* DAC PADs. */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, 0x0f );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, 0x0f);
        emu->emu1010.dac_pads = 0x0f;
 -      snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp );
 -      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30 );
 -      snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp );
 +      snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp);
 +      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp);
        /* SPDIF Format. Set Consumer mode, 24bit, copy enable */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10 );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10);
        /* MIDI routing */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19);
        /* Unknown. */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c );
 -      /* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); // IRQ Enable: All on */
 +      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c);
 +      /* IRQ Enable: Alll on */
 +      /* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); */
        /* IRQ Enable: All off */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00 );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);
  
 -      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
 -      snd_printk(KERN_INFO "emu1010: Card options3=0x%x\n",reg);
 +      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);
 +      snd_printk(KERN_INFO "emu1010: Card options3 = 0x%x\n", reg);
        /* Default WCLK set to 48kHz. */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00 );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00);
        /* Word Clock source, Internal 48kHz x1 */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K );
 -      //snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);
 +      /* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X); */
        /* Audio Dock LEDs. */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12 );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);
  
  #if 0
        /* For 96kHz */
         * Defaults only, users will set their own values anyways, let's
         * just copy/paste.
         */
 -      
 +
        snd_emu1010_fpga_link_dst_src_write(emu,
                EMU_DST_ALICE2_EMU32_8, EMU_SRC_DOCK_MIC_A1);
        snd_emu1010_fpga_link_dst_src_write(emu,
        snd_emu1010_fpga_link_dst_src_write(emu,
                EMU_DST_ALICE2_EMU32_F, EMU_SRC_HAMOA_ADC_LEFT2);
  #endif
 -      for (i = 0;i < 0x20; i++ ) {
 -              /* AudioDock Elink <-  Silence */
 -              snd_emu1010_fpga_link_dst_src_write(emu, 0x0100+i, EMU_SRC_SILENCE);
 +      for (i = 0; i < 0x20; i++) {
 +              /* AudioDock Elink <- Silence */
 +              snd_emu1010_fpga_link_dst_src_write(emu, 0x0100 + i, EMU_SRC_SILENCE);
        }
 -      for (i = 0;i < 4; i++) {
 +      for (i = 0; i < 4; i++) {
                /* Hana SPDIF Out <- Silence */
 -              snd_emu1010_fpga_link_dst_src_write(emu, 0x0200+i, EMU_SRC_SILENCE);
 +              snd_emu1010_fpga_link_dst_src_write(emu, 0x0200 + i, EMU_SRC_SILENCE);
        }
 -      for (i = 0;i < 7; i++) {
 +      for (i = 0; i < 7; i++) {
                /* Hamoa DAC <- Silence */
 -              snd_emu1010_fpga_link_dst_src_write(emu, 0x0300+i, EMU_SRC_SILENCE);
 +              snd_emu1010_fpga_link_dst_src_write(emu, 0x0300 + i, EMU_SRC_SILENCE);
        }
 -      for (i = 0;i < 7; i++) {
 +      for (i = 0; i < 7; i++) {
                /* Hana ADAT Out <- Silence */
                snd_emu1010_fpga_link_dst_src_write(emu, EMU_DST_HANA_ADAT + i, EMU_SRC_SILENCE);
        }
                EMU_DST_ALICE_I2S2_LEFT, EMU_SRC_DOCK_ADC3_LEFT1);
        snd_emu1010_fpga_link_dst_src_write(emu,
                EMU_DST_ALICE_I2S2_RIGHT, EMU_SRC_DOCK_ADC3_RIGHT1);
 -      snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x01 ); // Unmute all
 +      snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x01); /* Unmute all */
 +
 +      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp);
  
 -      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp );
 -      
        /* AC97 1.03, Any 32Meg of 2Gig address, Auto-Mute, EMU32 Slave,
         * Lock Sound Memory Cache, Lock Tank Memory Cache,
         * Mute all codecs.
         */
 -      outl(0x0000a000, emu->port + HCFG); 
 +      outl(0x0000a000, emu->port + HCFG);
        /* AC97 1.03, Any 32Meg of 2Gig address, Auto-Mute, EMU32 Slave,
         * Lock Sound Memory Cache, Lock Tank Memory Cache,
         * Un-Mute all codecs.
         */
        outl(0x0000a001, emu->port + HCFG);
 - 
 +
        /* Initial boot complete. Now patches */
  
 -      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp );
 -      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 ); /* MIDI Route */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c ); /* Unknown */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 ); /* MIDI Route */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c ); /* Unknown */
 -      snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp ); 
 -      snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10 ); /* SPDIF Format spdif  (or 0x11 for aes/ebu) */
 +      snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp);
 +      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19); /* MIDI Route */
 +      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c); /* Unknown */
 +      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19); /* MIDI Route */
 +      snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c); /* Unknown */
 +      snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp);
 +      snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10); /* SPDIF Format spdif  (or 0x11 for aes/ebu) */
  
        /* Start Micro/Audio Dock firmware loader thread */
        if (!emu->emu1010.firmware_thread) {
                emu->emu1010.output_source[23] = 28;
        }
        /* TEMP: Select SPDIF in/out */
 -      //snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); /* Output spdif */
 +      /* snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); */ /* Output spdif */
  
        /* TEMP: Select 48kHz SPDIF out */
        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x0); /* Mute all */
        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x0); /* Default fallback clock 48kHz */
        /* Word Clock source, Internal 48kHz x1 */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K );
 -      //snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X );
 +      snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);
 +      /* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X); */
        emu->emu1010.internal_clock = 1; /* 48000 */
 -      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);/* Set LEDs on Audio Dock */
 +      snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12); /* Set LEDs on Audio Dock */
        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x1); /* Unmute all */
 -      //snd_emu1010_fpga_write(emu, 0x7, 0x0); /* Mute all */
 -      //snd_emu1010_fpga_write(emu, 0x7, 0x1); /* Unmute all */
 -      //snd_emu1010_fpga_write(emu, 0xe, 0x12); /* Set LEDs on Audio Dock */
 +      /* snd_emu1010_fpga_write(emu, 0x7, 0x0); */ /* Mute all */
 +      /* snd_emu1010_fpga_write(emu, 0x7, 0x1); */ /* Unmute all */
 +      /* snd_emu1010_fpga_write(emu, 0xe, 0x12); */ /* Set LEDs on Audio Dock */
  
        return 0;
  }
@@@ -1249,13 -1247,13 +1249,13 @@@ static void free_pm_buffer(struct snd_e
  static int snd_emu10k1_free(struct snd_emu10k1 *emu)
  {
        if (emu->port) {        /* avoid access to already used hardware */
 -              snd_emu10k1_fx8010_tram_setup(emu, 0);
 +              snd_emu10k1_fx8010_tram_setup(emu, 0);
                snd_emu10k1_done(emu);
                snd_emu10k1_free_efx(emu);
 -              }
 +      }
        if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1010) {
                /* Disable 48Volt power to Audio Dock */
 -              snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  0 );
 +              snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, 0);
        }
        if (emu->emu1010.firmware_thread)
                kthread_stop(emu->emu1010.firmware_thread);
  #endif
        if (emu->port)
                pci_release_regions(emu->pci);
 -      if (emu->card_capabilities->ca0151_chip) /* P16V */     
 +      if (emu->card_capabilities->ca0151_chip) /* P16V */
                snd_p16v_free(emu);
        pci_disable_device(emu->pci);
        kfree(emu);
@@@ -1294,6 -1292,21 +1294,6 @@@ static int snd_emu10k1_dev_free(struct 
  }
  
  static struct snd_emu_chip_details emu_chip_details[] = {
 -      /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/
 -      /* Tested by James@superbug.co.uk 3rd July 2005 */
 -      /* DSP: CA0108-IAT
 -       * DAC: CS4382-KQ
 -       * ADC: Philips 1361T
 -       * AC97: STAC9750
 -       * CA0151: None
 -       */
 -      {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,
 -       .driver = "Audigy2", .name = "Audigy 2 Value [SB0400]", 
 -       .id = "Audigy2",
 -       .emu10k2_chip = 1,
 -       .ca0108_chip = 1,
 -       .spk71 = 1,
 -       .ac97_chip = 1} ,
        /* Audigy4 (Not PRO) SB0610 */
        /* Tested by James@superbug.co.uk 4th April 2006 */
        /* A_IOCFG bits
         * CA0151: None
         */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10211102,
 -       .driver = "Audigy2", .name = "Audigy 4 [SB0610]", 
 +       .driver = "Audigy2", .name = "SB Audigy 4 [SB0610]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
         .spk71 = 1,
         .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
         .ac97_chip = 1} ,
 +      /* Audigy 2 Value AC3 out does not work yet.
 +       * Need to find out how to turn off interpolators.
 +       */
 +      /* Tested by James@superbug.co.uk 3rd July 2005 */
 +      /* DSP: CA0108-IAT
 +       * DAC: CS4382-KQ
 +       * ADC: Philips 1361T
 +       * AC97: STAC9750
 +       * CA0151: None
 +       */
 +      {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,
 +       .driver = "Audigy2", .name = "SB Audigy 2 Value [SB0400]",
 +       .id = "Audigy2",
 +       .emu10k2_chip = 1,
 +       .ca0108_chip = 1,
 +       .spk71 = 1,
 +       .ac97_chip = 1} ,
        /* Audigy 2 ZS Notebook Cardbus card.*/
        /* Tested by James@superbug.co.uk 6th November 2006 */
        /* Audio output 7.1/Headphones working.
         * Digital output working. (AC3 not checked, only PCM)
         * Audio Mic/Line inputs working.
         * Digital input not tested.
 -       */ 
 +       */
        /* DSP: Tina2
         * DAC: Wolfson WM8768/WM8568
         * ADC: Wolfson WM8775
         *
         */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102,
 -       .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]", 
 +       .driver = "Audigy2", .name = "SB Audigy 2 ZS Notebook [SB0530]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
         .spk71 = 1} ,
        /* Tested by James@superbug.co.uk 4th Nov 2007. */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x42011102,
 -       .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]", 
 +       .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]",
         .id = "EMU1010",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
         .spk71 = 1 ,
         .emu_model = EMU_MODEL_EMU1616},
        /* Tested by James@superbug.co.uk 4th Nov 2007. */
 +      /* This is MAEM8960, 0202 is MAEM 8980 */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40041102,
 -       .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM????]", 
 +       .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM8960]",
         .id = "EMU1010",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
         .spk71 = 1,
 -       .emu_model = EMU_MODEL_EMU1010B},
 +       .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 new revision */
        /* Tested by James@superbug.co.uk 8th July 2005. */
 +      /* This is MAEM8810, 0202 is MAEM8820 */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
 -       .driver = "Audigy2", .name = "E-mu 1010 [4001]",
 +       .driver = "Audigy2", .name = "E-mu 1010 [MAEM8810]",
         .id = "EMU1010",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .spk71 = 1,
 -       .emu_model = EMU_MODEL_EMU1010}, /* Emu 1010 */
 +       .emu_model = EMU_MODEL_EMU1010}, /* EMU 1010 old revision */
        /* EMU0404b */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102,
 -       .driver = "Audigy2", .name = "E-mu 0404b [4002]",
 +       .driver = "Audigy2", .name = "E-mu 0404b PCI [MAEM8852]",
         .id = "EMU0404",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
         .spk71 = 1,
 -       .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
 +       .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 new revision */
        /* Tested by James@superbug.co.uk 20-3-2007. */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40021102,
 -       .driver = "Audigy2", .name = "E-mu 0404 [4002]",
 +       .driver = "Audigy2", .name = "E-mu 0404 [MAEM8850]",
         .id = "EMU0404",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .spk71 = 1,
         .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
 -      /* Audigy4 (Not PRO) SB0610 */
 -      {.vendor = 0x1102, .device = 0x0008, 
 -       .driver = "Audigy2", .name = "Audigy 2 Value [Unknown]", 
 +      /* Note that all E-mu cards require kernel 2.6 or newer. */
 +      {.vendor = 0x1102, .device = 0x0008,
 +       .driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
         .ac97_chip = 1} ,
        /* Tested by James@superbug.co.uk 3rd July 2005 */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102,
 -       .driver = "Audigy2", .name = "Audigy 4 PRO [SB0380]", 
 +       .driver = "Audigy2", .name = "SB Audigy 4 PRO [SB0380]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         * Just like 0x20021102
         */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20061102,
 -       .driver = "Audigy2", .name = "Audigy 2 [SB0350b]", 
 +       .driver = "Audigy2", .name = "SB Audigy 2 [SB0350b]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .ca0151_chip = 1,
         .spk71 = 1,
         .spdif_bug = 1,
+        .invert_shared_spdif = 1,      /* digital/analog switch swapped */
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,
 -       .driver = "Audigy2", .name = "Audigy 2 ZS [SB0350]", 
 +       .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .ca0151_chip = 1,
         .spk71 = 1,
         .spdif_bug = 1,
+        .invert_shared_spdif = 1,      /* digital/analog switch swapped */
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102,
 -       .driver = "Audigy2", .name = "Audigy 2 ZS [2001]", 
 +       .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0360]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .ca0151_chip = 1,
         .spk71 = 1,
         .spdif_bug = 1,
+        .invert_shared_spdif = 1,      /* digital/analog switch swapped */
         .ac97_chip = 1} ,
        /* Audigy 2 */
        /* Tested by James@superbug.co.uk 3rd July 2005 */
         * CA0151: Yes
         */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10071102,
 -       .driver = "Audigy2", .name = "Audigy 2 [SB0240]", 
 +       .driver = "Audigy2", .name = "SB Audigy 2 [SB0240]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 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]", 
 +       .driver = "Audigy2", .name = "SB Audigy 2 Platinum EX [SB0280]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
        /* Dell OEM/Creative Labs Audigy 2 ZS */
        /* See ALSA bug#1365 */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10031102,
 -       .driver = "Audigy2", .name = "Audigy 2 ZS [SB0353]",
 +       .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0353]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .spdif_bug = 1,
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
 -       .driver = "Audigy2", .name = "Audigy 2 Platinum [SB0240P]", 
 +       .driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .adc_1361t = 1,  /* 24 bit capture instead of 16bit. Fixes ALSA bug#324 */
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .revision = 0x04,
 -       .driver = "Audigy2", .name = "Audigy 2 [Unknown]",
 +       .driver = "Audigy2", .name = "SB Audigy 2 [Unknown]",
         .id = "Audigy2",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .spdif_bug = 1,
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00531102,
 -       .driver = "Audigy", .name = "Audigy 1 [SB0090]", 
 +       .driver = "Audigy", .name = "SB Audigy 1 [SB0092]",
         .id = "Audigy",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00521102,
 -       .driver = "Audigy", .name = "Audigy 1 ES [SB0160]", 
 +       .driver = "Audigy", .name = "SB Audigy 1 ES [SB0160]",
         .id = "Audigy",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .spdif_bug = 1,
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00511102,
 -       .driver = "Audigy", .name = "Audigy 1 [SB0090]", 
 +       .driver = "Audigy", .name = "SB Audigy 1 [SB0090]",
         .id = "Audigy",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0004,
 -       .driver = "Audigy", .name = "Audigy 1 [Unknown]", 
 +       .driver = "Audigy", .name = "Audigy 1 [Unknown]",
         .id = "Audigy",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
         .ac97_chip = 1} ,
 -      {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102,
 -       .driver = "EMU10K1", .name = "SBLive! [SB0105]", 
 +      {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x100a1102,
 +       .driver = "EMU10K1", .name = "SB Live! 5.1 [SB0220]",
 +       .id = "Live",
 +       .emu10k1_chip = 1,
 +       .ac97_chip = 1,
 +       .sblive51 = 1} ,
 +      {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806b1102,
 +       .driver = "EMU10K1", .name = "SB Live! [SB0105]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
 -      {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [SB0103]", 
 +      {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806a1102,
 +       .driver = "EMU10K1", .name = "SB Live! Value [SB0103]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [SB0101]", 
 +       .driver = "EMU10K1", .name = "SB Live! Value [SB0101]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        /* Tested by ALSA bug#1680 26th December 2005 */
 -      /* note: It really has SB0220 written on the card. */
 +      /* note: It really has SB0220 written on the card, */
 +      /* but it's SB0228 according to kx.inf */
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80661102,
 -       .driver = "EMU10K1", .name = "SB Live 5.1 Dell OEM [SB0220]", 
 +       .driver = "EMU10K1", .name = "SB Live! 5.1 Dell OEM [SB0228]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        /* Tested by Thomas Zehetbauer 27th Aug 2005 */
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80651102,
 -       .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]", 
 -       .id = "Live",
 -       .emu10k1_chip = 1,
 -       .ac97_chip = 1,
 -       .sblive51 = 1} ,
 -      {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x100a1102,
 -       .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]", 
 +       .driver = "EMU10K1", .name = "SB Live! 5.1 [SB0220]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,
 -       .driver = "EMU10K1", .name = "SB Live 5.1", 
 +       .driver = "EMU10K1", .name = "SB Live! 5.1",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        /* Tested by alsa bugtrack user "hus" bug #1297 12th Aug 2005 */
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
 -       .driver = "EMU10K1", .name = "SBLive 5.1 [SB0060]",
 +       .driver = "EMU10K1", .name = "SB Live! 5.1 [SB0060]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 2, /* ac97 is optional; both SBLive 5.1 and platinum
                          */
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [CT4850]", 
 +       .driver = "EMU10K1", .name = "SB Live! Value [CT4850]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,
 -       .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]", 
 +       .driver = "EMU10K1", .name = "SB Live! Platinum [CT4760P]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [CT4871]", 
 +       .driver = "EMU10K1", .name = "SB Live! Value [CT4871]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80311102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [CT4831]", 
 +       .driver = "EMU10K1", .name = "SB Live! Value [CT4831]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [CT4870]", 
 +       .driver = "EMU10K1", .name = "SB Live! Value [CT4870]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        /* Tested by James@superbug.co.uk 3rd July 2005 */
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [CT4832]", 
 +       .driver = "EMU10K1", .name = "SB Live! Value [CT4832]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [CT4830]", 
 +       .driver = "EMU10K1", .name = "SB Live! Value [CT4830]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102,
 -       .driver = "EMU10K1", .name = "SB PCI512 [CT4790]", 
 +       .driver = "EMU10K1", .name = "SB PCI512 [CT4790]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [CT4780]", 
 +       .driver = "EMU10K1", .name = "SB Live! Value [CT4780]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,
 -       .driver = "EMU10K1", .name = "E-mu APS [4001]", 
 +       .driver = "EMU10K1", .name = "E-mu APS [PC545]",
         .id = "APS",
         .emu10k1_chip = 1,
         .ecard = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,
 -       .driver = "EMU10K1", .name = "SBLive! [CT4620]", 
 +       .driver = "EMU10K1", .name = "SB Live! [CT4620]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102,
 -       .driver = "EMU10K1", .name = "SBLive! Value [CT4670]", 
 +       .driver = "EMU10K1", .name = "SB Live! Value [CT4670]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002,
 -       .driver = "EMU10K1", .name = "SB Live [Unknown]", 
 +       .driver = "EMU10K1", .name = "SB Live! [Unknown]",
         .id = "Live",
         .emu10k1_chip = 1,
         .ac97_chip = 1,
  };
  
  int __devinit snd_emu10k1_create(struct snd_card *card,
 -                     struct pci_dev * pci,
 +                     struct pci_dev *pci,
                       unsigned short extin_mask,
                       unsigned short extout_mask,
                       long max_cache_bytes,
                       int enable_ir,
                       uint subsystem,
 -                     struct snd_emu10k1 ** remu)
 +                     struct snd_emu10k1 **remu)
  {
        struct snd_emu10k1 *emu;
        int idx, err;
        static struct snd_device_ops ops = {
                .dev_free =     snd_emu10k1_dev_free,
        };
 -      
 +
        *remu = NULL;
  
        /* enable PCI device */
 -      if ((err = pci_enable_device(pci)) < 0)
 +      err = pci_enable_device(pci);
 +      if (err < 0)
                return err;
  
        emu = kzalloc(sizeof(*emu), GFP_KERNEL);
        emu->revision = pci->revision;
        pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial);
        pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model);
 -      snd_printdd("vendor=0x%x, device=0x%x, subsystem_vendor_id=0x%x, subsystem_id=0x%x\n",pci->vendor, pci->device, emu->serial, emu->model);
 +      snd_printdd("vendor = 0x%x, device = 0x%x, subsystem_vendor_id = 0x%x, subsystem_id = 0x%x\n", pci->vendor, pci->device, emu->serial, emu->model);
  
        for (c = emu_chip_details; c->vendor; c++) {
                if (c->vendor == pci->vendor && c->device == pci->device) {
                        if (subsystem) {
 -                              if (c->subsystem && (c->subsystem == subsystem) ) {
 +                              if (c->subsystem && (c->subsystem == subsystem))
                                        break;
 -                              } else continue;
 +                              else
 +                                      continue;
                        } else {
 -                              if (c->subsystem && (c->subsystem != emu->serial) )
 +                              if (c->subsystem && (c->subsystem != emu->serial))
                                        continue;
                                if (c->revision && c->revision != emu->revision)
                                        continue;
        }
        emu->card_capabilities = c;
        if (c->subsystem && !subsystem)
 -              snd_printdd("Sound card name=%s\n", c->name);
 -      else if (subsystem) 
 -              snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x. Forced to subsytem=0x%x\n",
 -                      c->name, pci->vendor, pci->device, emu->serial, c->subsystem);
 -      else 
 -              snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x.\n",
 -                      c->name, pci->vendor, pci->device, emu->serial);
 -      
 +              snd_printdd("Sound card name = %s\n", c->name);
 +      else if (subsystem)
 +              snd_printdd("Sound card name = %s, "
 +                      "vendor = 0x%x, device = 0x%x, subsystem = 0x%x. "
 +                      "Forced to subsytem = 0x%x\n",  c->name,
 +                      pci->vendor, pci->device, emu->serial, c->subsystem);
 +      else
 +              snd_printdd("Sound card name = %s, "
 +                      "vendor = 0x%x, device = 0x%x, subsystem = 0x%x.\n",
 +                      c->name, pci->vendor, pci->device,
 +                      emu->serial);
 +
        if (!*card->id && c->id) {
                int i, n = 0;
                strlcpy(card->id, c->id, sizeof(card->id));
        else
                emu->gpr_base = FXGPREGBASE;
  
 -      if ((err = pci_request_regions(pci, "EMU10K1")) < 0) {
 +      err = pci_request_regions(pci, "EMU10K1");
 +      if (err < 0) {
                kfree(emu);
                pci_disable_device(pci);
                return err;
        emu->enable_ir = enable_ir;
  
        if (emu->card_capabilities->ca_cardbus_chip) {
 -              if ((err = snd_emu10k1_cardbus_init(emu)) < 0)
 +              err = snd_emu10k1_cardbus_init(emu);
 +              if (err < 0)
                        goto error;
        }
        if (emu->card_capabilities->ecard) {
 -              if ((err = snd_emu10k1_ecard_init(emu)) < 0)
 +              err = snd_emu10k1_ecard_init(emu);
 +              if (err < 0)
                        goto error;
        } else if (emu->card_capabilities->emu_model) {
 -              if ((err = snd_emu10k1_emu1010_init(emu)) < 0) {
 -                      snd_emu10k1_free(emu);
 -                      return err;
 -              }
 +              err = snd_emu10k1_emu1010_init(emu);
 +              if (err < 0) {
 +                      snd_emu10k1_free(emu);
 +                      return err;
 +              }
        } else {
                /* 5.1: Enable the additional AC97 Slots. If the emu10k1 version
                        does not support this, it shouldn't do any harm */
 -              snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE);
 +              snd_emu10k1_ptr_write(emu, AC97SLOT, 0,
 +                                      AC97SLOT_CNTR|AC97SLOT_LFE);
        }
  
        /* initialize TRAM setup */
                snd_emu10k1_synth_alloc(emu, 4096);
        if (emu->reserved_page)
                emu->reserved_page->map_locked = 1;
 -      
 +
        /* Clear silent pages and set up pointers */
        memset(emu->silent_page.area, 0, PAGE_SIZE);
        silent_page = emu->silent_page.addr << 1;
                emu->voices[idx].number = idx;
        }
  
 -      if ((err = snd_emu10k1_init(emu, enable_ir, 0)) < 0)
 +      err = snd_emu10k1_init(emu, enable_ir, 0);
 +      if (err < 0)
                goto error;
  #ifdef CONFIG_PM
 -      if ((err = alloc_pm_buffer(emu)) < 0)
 +      err = alloc_pm_buffer(emu);
 +      if (err < 0)
                goto error;
  #endif
  
        /*  Initialize the effect engine */
 -      if ((err = snd_emu10k1_init_efx(emu)) < 0)
 +      err = snd_emu10k1_init_efx(emu);
 +      if (err < 0)
                goto error;
        snd_emu10k1_audio_enable(emu);
  
 -      if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, emu, &ops)) < 0)
 +      err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, emu, &ops);
 +      if (err < 0)
                goto error;
  
  #ifdef CONFIG_PROC_FS
@@@ -2000,7 -1981,7 +2003,7 @@@ static int __devinit alloc_pm_buffer(st
        if (emu->audigy)
                size += ARRAY_SIZE(saved_regs_audigy);
        emu->saved_ptr = vmalloc(4 * NUM_G * size);
 -      if (! emu->saved_ptr)
 +      if (!emu->saved_ptr)
                return -ENOMEM;
        if (snd_emu10k1_efx_alloc_pm_buffer(emu) < 0)
                return -ENOMEM;
@@@ -2045,7 -2026,7 +2048,7 @@@ void snd_emu10k1_resume_init(struct snd
        if (emu->card_capabilities->ecard)
                snd_emu10k1_ecard_init(emu);
        else if (emu->card_capabilities->emu_model)
 -              snd_emu10k1_emu1010_init(emu);
 +              snd_emu10k1_emu1010_init(emu);
        else
                snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE);
        snd_emu10k1_init(emu, emu->enable_ir, 1);