1 files changed, 91 insertions, 53 deletions

diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index 9be900224771..2dfa932f7825 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -125,65 +125,43 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
         if ((err = snd_emu10k1_create(card, pci, extin[dev], extout[dev],
                                       (long)max_buffer_size[dev] * 1024 * 1024,
                                       enable_ir[dev], subsystem[dev],
-                                      &emu)) < 0) {
-                snd_card_free(card);
-                return err;
-        }               
-        if ((err = snd_emu10k1_pcm(emu, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }               
-        if ((err = snd_emu10k1_pcm_mic(emu, 1, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }               
-        if ((err = snd_emu10k1_pcm_efx(emu, 2, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+                                      &emu)) < 0)
+                goto error;
+        card->private_data = emu;
+        if ((err = snd_emu10k1_pcm(emu, 0, NULL)) < 0)
+                goto error;
+        if ((err = snd_emu10k1_pcm_mic(emu, 1, NULL)) < 0)
+                goto error;
+        if ((err = snd_emu10k1_pcm_efx(emu, 2, NULL)) < 0)
+                goto error;
         /* This stores the periods table. */
         if (emu->card_capabilities->ca0151_chip) { /* P16V */   
-                if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), 1024, &emu->p16v_buffer) < 0) {
-                        snd_p16v_free(emu);
-                        return -ENOMEM;
-                }
+                if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+                                               1024, &emu->p16v_buffer)) < 0)
+                        goto error;
         }
 
-        if ((err = snd_emu10k1_mixer(emu, 0, 3)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_emu10k1_mixer(emu, 0, 3)) < 0)
+                goto error;
         
-        if ((err = snd_emu10k1_timer(emu, 0)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_emu10k1_timer(emu, 0)) < 0)
+                goto error;
 
-        if ((err = snd_emu10k1_pcm_multi(emu, 3, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if (emu->card_capabilities->ca0151_chip) { /* P16V */   
-                if ((err = snd_p16v_pcm(emu, 4, NULL)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
+        if ((err = snd_emu10k1_pcm_multi(emu, 3, NULL)) < 0)
+                goto error;
+        if (emu->card_capabilities->ca0151_chip) { /* P16V */
+                if ((err = snd_p16v_pcm(emu, 4, NULL)) < 0)
+                        goto error;
         }
         if (emu->audigy) {
-                if ((err = snd_emu10k1_audigy_midi(emu)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
+                if ((err = snd_emu10k1_audigy_midi(emu)) < 0)
+                        goto error;
         } else {
-                if ((err = snd_emu10k1_midi(emu)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
-        }
-        if ((err = snd_emu10k1_fx8010_new(emu, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
+                if ((err = snd_emu10k1_midi(emu)) < 0)
+                        goto error;
         }
+        if ((err = snd_emu10k1_fx8010_new(emu, 0, NULL)) < 0)
+                goto error;
 #ifdef ENABLE_SYNTH
         if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,
                                sizeof(struct snd_emu10k1_synth_arg), &wave) < 0 ||
@@ -206,13 +184,16 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
                  "%s (rev.%d, serial:0x%x) at 0x%lx, irq %i",
                  card->shortname, emu->revision, emu->serial, emu->port, emu->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_card_register(card)) < 0)
+                goto error;
+
         pci_set_drvdata(pci, card);
         dev++;
         return 0;
+
+ error:
+        snd_card_free(card);
+        return err;
 }
 
 static void __devexit snd_card_emu10k1_remove(struct pci_dev *pci)
@@ -221,11 +202,68 @@ static void __devexit snd_card_emu10k1_remove(struct pci_dev *pci)
         pci_set_drvdata(pci, NULL);
 }
 
+
+#ifdef CONFIG_PM
+static int snd_emu10k1_suspend(struct pci_dev *pci, pm_message_t state)
+{
+        struct snd_card *card = pci_get_drvdata(pci);
+        struct snd_emu10k1 *emu = card->private_data;
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+
+        snd_pcm_suspend_all(emu->pcm);
+        snd_pcm_suspend_all(emu->pcm_mic);
+        snd_pcm_suspend_all(emu->pcm_efx);
+        snd_pcm_suspend_all(emu->pcm_multi);
+        snd_pcm_suspend_all(emu->pcm_p16v);
+
+        snd_ac97_suspend(emu->ac97);
+
+        snd_emu10k1_efx_suspend(emu);
+        snd_emu10k1_suspend_regs(emu);
+        if (emu->card_capabilities->ca0151_chip)
+                snd_p16v_suspend(emu);
+
+        snd_emu10k1_done(emu);
+
+        pci_set_power_state(pci, PCI_D3hot);
+        pci_disable_device(pci);
+        pci_save_state(pci);
+        return 0;
+}
+
+int snd_emu10k1_resume(struct pci_dev *pci)
+{
+        struct snd_card *card = pci_get_drvdata(pci);
+        struct snd_emu10k1 *emu = card->private_data;
+
+        pci_restore_state(pci);
+        pci_enable_device(pci);
+        pci_set_power_state(pci, PCI_D0);
+        pci_set_master(pci);
+        
+        snd_emu10k1_resume_init(emu);
+        snd_emu10k1_efx_resume(emu);
+        snd_ac97_resume(emu->ac97);
+        snd_emu10k1_resume_regs(emu);
+
+        if (emu->card_capabilities->ca0151_chip)
+                snd_p16v_resume(emu);
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+        return 0;
+}
+#endif
+
 static struct pci_driver driver = {
         .name = "EMU10K1_Audigy",
         .id_table = snd_emu10k1_ids,
         .probe = snd_card_emu10k1_probe,
         .remove = __devexit_p(snd_card_emu10k1_remove),
+#ifdef CONFIG_PM
+        .suspend = snd_emu10k1_suspend,
+        .resume = snd_emu10k1_resume,
+#endif
 };
 
 static int __init alsa_card_emu10k1_init(void)