diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-13 08:07:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-13 08:12:33 +0100 |
| commit | 28aa165cc52fa686a55a2a2052fdddad0fbde5eb (patch) | |
| tree | a445f5a0f8ad0915aece24b36c957d100f5cd77c | |
| parent | bd483d4c6c65c1c48483f2f81c603d42b39ce83b (diff) | |
| download | linux-3.10-28aa165cc52fa686a55a2a2052fdddad0fbde5eb.tar.gz linux-3.10-28aa165cc52fa686a55a2a2052fdddad0fbde5eb.tar.bz2 linux-3.10-28aa165cc52fa686a55a2a2052fdddad0fbde5eb.zip | |
ALSA: ymfpci - Fix legacy registers on S3/S4 resume
We need to resume two legacy registers to recover MIDI/FM functionality
on S3/S4 resume, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | include/sound/ymfpci.h | 2 | ||||
| -rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h index 444cd6ba0ba..41199664666 100644 --- a/include/sound/ymfpci.h +++ b/include/sound/ymfpci.h @@ -366,6 +366,8 @@ struct snd_ymfpci { #ifdef CONFIG_PM u32 *saved_regs; u32 saved_ydsxgr_mode; + u16 saved_dsxg_legacy; + u16 saved_dsxg_elegacy; #endif }; diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 03ee4e36531..a3a2eababc0 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c @@ -2310,6 +2310,10 @@ int snd_ymfpci_suspend(struct pci_dev *pci, pm_message_t state) for (i = 0; i < YDSXGR_NUM_SAVED_REGS; i++) chip->saved_regs[i] = snd_ymfpci_readl(chip, saved_regs_index[i]); chip->saved_ydsxgr_mode = snd_ymfpci_readl(chip, YDSXGR_MODE); + pci_read_config_word(chip->pci, PCIR_DSXG_LEGACY, + &chip->saved_dsxg_legacy); + pci_read_config_word(chip->pci, PCIR_DSXG_ELEGACY, + &chip->saved_dsxg_elegacy); snd_ymfpci_writel(chip, YDSXGR_NATIVEDACOUTVOL, 0); snd_ymfpci_writel(chip, YDSXGR_BUF441OUTVOL, 0); snd_ymfpci_disable_dsp(chip); @@ -2344,6 +2348,11 @@ int snd_ymfpci_resume(struct pci_dev *pci) snd_ac97_resume(chip->ac97); + pci_write_config_word(chip->pci, PCIR_DSXG_LEGACY, + chip->saved_dsxg_legacy); + pci_write_config_word(chip->pci, PCIR_DSXG_ELEGACY, + chip->saved_dsxg_elegacy); + /* start hw again */ if (chip->start_count > 0) { spin_lock_irq(&chip->reg_lock); |