1 files changed, 8 insertions, 4 deletions

diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index b7c1875ba90e..8c5010f7889c 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -99,8 +99,8 @@ static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1_ids) = {
 
 MODULE_DEVICE_TABLE(pci, snd_emu10k1_ids);
 
-static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
-                                            const struct pci_device_id *pci_id)
+static int snd_card_emu10k1_probe(struct pci_dev *pci,
+                                  const struct pci_device_id *pci_id)
 {
         static int dev;
         struct snd_card *card;
@@ -199,7 +199,7 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
         return err;
 }
 
-static void __devexit snd_card_emu10k1_remove(struct pci_dev *pci)
+static void snd_card_emu10k1_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
         pci_set_drvdata(pci, NULL);
@@ -215,6 +215,8 @@ static int snd_emu10k1_suspend(struct device *dev)
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
 
+        emu->suspend = 1;
+
         snd_pcm_suspend_all(emu->pcm);
         snd_pcm_suspend_all(emu->pcm_mic);
         snd_pcm_suspend_all(emu->pcm_efx);
@@ -260,6 +262,8 @@ static int snd_emu10k1_resume(struct device *dev)
         if (emu->card_capabilities->ca0151_chip)
                 snd_p16v_resume(emu);
 
+        emu->suspend = 0;
+
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
         return 0;
 }
@@ -274,7 +278,7 @@ static struct pci_driver emu10k1_driver = {
         .name = KBUILD_MODNAME,
         .id_table = snd_emu10k1_ids,
         .probe = snd_card_emu10k1_probe,
-        .remove = __devexit_p(snd_card_emu10k1_remove),
+        .remove = snd_card_emu10k1_remove,
         .driver = {
                 .pm = SND_EMU10K1_PM_OPS,
         },