]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: ca0106 - Check ac97 availability at PM
authorTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 08:42:09 +0000 (09:42 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 08:42:09 +0000 (09:42 +0100)
Check the availability of ac97 at PM suspend/resume callbacks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/ca0106/ca0106_main.c

index 2c71f9b896cd1c7d860789ac579dec3ef58d8814..e01ecd3db324d1331810b1e73831d64d1f7e92c1 100644 (file)
@@ -1752,7 +1752,8 @@ static int snd_ca0106_suspend(struct pci_dev *pci, pm_message_t state)
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
        for (i = 0; i < 4; i++)
                snd_pcm_suspend_all(chip->pcm[i]);
-       snd_ac97_suspend(chip->ac97);
+       if (chip->details->ac97)
+               snd_ac97_suspend(chip->ac97);
        snd_ca0106_mixer_suspend(chip);
 
        ca0106_stop_chip(chip);
@@ -1781,7 +1782,8 @@ static int snd_ca0106_resume(struct pci_dev *pci)
 
        ca0106_init_chip(chip, 1);
 
-       snd_ac97_resume(chip->ac97);
+       if (chip->details->ac97)
+               snd_ac97_resume(chip->ac97);
        snd_ca0106_mixer_resume(chip);
        if (chip->details->spi_dac) {
                for (i = 0; i < ARRAY_SIZE(chip->spi_dac_reg); i++)