diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 03:42:09 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 03:42:09 -0500 |
commit | 50232d62cace101e03f8f40ca151b978c0db5a0d (patch) | |
tree | d94273f28ebf0b4cbc3730c0c9a1a307ff31b987 /sound/pci/ca0106 | |
parent | 8df0f70751dc0e51d0550caee3416339183c5767 (diff) |
ALSA: ca0106 - Check ac97 availability at PM
Check the availability of ac97 at PM suspend/resume callbacks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ca0106')
-rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 2c71f9b896cd..e01ecd3db324 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1752,7 +1752,8 @@ static int snd_ca0106_suspend(struct pci_dev *pci, pm_message_t state) | |||
1752 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); | 1752 | snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); |
1753 | for (i = 0; i < 4; i++) | 1753 | for (i = 0; i < 4; i++) |
1754 | snd_pcm_suspend_all(chip->pcm[i]); | 1754 | snd_pcm_suspend_all(chip->pcm[i]); |
1755 | snd_ac97_suspend(chip->ac97); | 1755 | if (chip->details->ac97) |
1756 | snd_ac97_suspend(chip->ac97); | ||
1756 | snd_ca0106_mixer_suspend(chip); | 1757 | snd_ca0106_mixer_suspend(chip); |
1757 | 1758 | ||
1758 | ca0106_stop_chip(chip); | 1759 | ca0106_stop_chip(chip); |
@@ -1781,7 +1782,8 @@ static int snd_ca0106_resume(struct pci_dev *pci) | |||
1781 | 1782 | ||
1782 | ca0106_init_chip(chip, 1); | 1783 | ca0106_init_chip(chip, 1); |
1783 | 1784 | ||
1784 | snd_ac97_resume(chip->ac97); | 1785 | if (chip->details->ac97) |
1786 | snd_ac97_resume(chip->ac97); | ||
1785 | snd_ca0106_mixer_resume(chip); | 1787 | snd_ca0106_mixer_resume(chip); |
1786 | if (chip->details->spi_dac) { | 1788 | if (chip->details->spi_dac) { |
1787 | for (i = 0; i < ARRAY_SIZE(chip->spi_dac_reg); i++) | 1789 | for (i = 0; i < ARRAY_SIZE(chip->spi_dac_reg); i++) |