Changeset 284

Timestamp:

Feb 10, 2008, 6:58:24 PM (18 years ago)

Author:

Brendan Oakley

Message:

Apply SB Live fix to ReSync branch

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/ac97/ac97_codec.c (modified) (2 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/ac97/ac97_codec.c

@@ -562 +562 @@
         err = snd_ac97_update_bits(ac97, reg, val_mask, val);
         snd_ac97_page_restore(ac97, page_save);
-#ifdef CONFIG_SND_AC97_POWER_SAVE
-        /* check analog mixer power-down */
-        if ((val_mask & 0x8000) &&
-            (kcontrol->private_value & (1<<30))) {
-                if (val & 0x8000)
-                        ac97->power_up &= ~(1 << (reg>>1));
-                else
-                    ac97->power_up |= 1 << (reg>>1);
-                update_power_regs(ac97);
-        }
-#endif
         return err;
 }
@@ -2275 +2264 @@
         }
         /* make sure the proper powerdown bits are cleared */
-        if (ac97_is_audio(ac97))
-            update_power_regs(ac97);
+        if (ac97->scaps && ac97_is_audio(ac97)) {
+                reg = snd_ac97_read(ac97, AC97_EXTENDED_STATUS);
+                if (ac97->scaps & AC97_SCAP_SURROUND_DAC)
+                        reg &= ~AC97_EA_PRJ;
+                if (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC)
+                        reg &= ~(AC97_EA_PRI | AC97_EA_PRK);
+                snd_ac97_write_cache(ac97, AC97_EXTENDED_STATUS, reg);
+        }
         snd_ac97_proc_init(ac97);
         if ((err = snd_device_new(card, SNDRV_DEV_CODEC, ac97, &ops)) < 0) {