upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / sound / pci / nm256 / nm256.c

diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 4d9cdb4..356fbea 100644 (file)
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -1130,7 +1130,7 @@ snd_nm256_ac97_read(ac97_t *ac97, unsigned short reg)
                return 0;
        res = snd_nm256_readw(chip, chip->mixer_base + reg);
        /* Magic delay.  Bleah yucky.  */
-       udelay(1000);
+       msleep(1);
        return res;
 }
 
@@ -1151,7 +1151,7 @@ snd_nm256_ac97_write(ac97_t *ac97,
        /* Wait for the write to take, too. */
        while (tries-- > 0) {
                snd_nm256_writew(chip, base + reg, val);
-               udelay(1000);  /* a little delay here seems better.. */
+               msleep(1);  /* a little delay here seems better.. */
                if (snd_nm256_ac97_ready(chip))
                        return;
        }
@@ -1267,7 +1267,7 @@ snd_nm256_peek_for_sig(nm256_t *chip)
  * APM event handler, so the card is properly reinitialized after a power
  * event.
  */
-static int nm256_suspend(snd_card_t *card, unsigned int state)
+static int nm256_suspend(snd_card_t *card, pm_message_t state)
 {
        nm256_t *chip = card->pm_private_data;
 
@@ -1275,11 +1275,10 @@ static int nm256_suspend(snd_card_t *card, unsigned int state)
        snd_ac97_suspend(chip->ac97);
        chip->coeffs_current = 0;
        pci_disable_device(chip->pci);
-       snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
        return 0;
 }
 
-static int nm256_resume(snd_card_t *card, unsigned int state)
+static int nm256_resume(snd_card_t *card)
 {
        nm256_t *chip = card->pm_private_data;
 
@@ -1290,7 +1289,6 @@ static int nm256_resume(snd_card_t *card, unsigned int state)
        /* restore ac97 */
        snd_ac97_resume(chip->ac97);
 
-       snd_power_change_state(card, SNDRV_CTL_POWER_D0);
        return 0;
 }
 #endif /* CONFIG_PM */