aboutsummaryrefslogtreecommitdiffstats
path: root/sound/ppc/awacs.c
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@us.ibm.com>2005-07-09 04:53:24 -0400
committerJaroslav Kysela <perex@suse.cz>2005-07-28 06:22:15 -0400
commit989a0b248bbf32c89e60dc6f02219e446b320712 (patch)
tree6eab18b706182471ad1a22636a3c769c068836f0 /sound/ppc/awacs.c
parentef21ca24faf28df6d06939e77d5032a313490289 (diff)
[ALSA] Fix-up sleeping in sound/ppc
PPC AWACS driver,PPC PMAC driver,PPC Tumbler driver Description: Fix-up sleeping in sound/ppc. Replace big_mdelay() with msleep() to guarantee the task delays as expected. This also involved replacing/removing custom sleep functions. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/ppc/awacs.c')
-rw-r--r--sound/ppc/awacs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 061e52d3d771..758ca1bcbcf2 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -103,7 +103,7 @@ static void screamer_recalibrate(pmac_t *chip)
103 snd_pmac_awacs_write_noreg(chip, 1, chip->awacs_reg[1]); 103 snd_pmac_awacs_write_noreg(chip, 1, chip->awacs_reg[1]);
104 if (chip->manufacturer == 0x1) 104 if (chip->manufacturer == 0x1)
105 /* delay for broken crystal part */ 105 /* delay for broken crystal part */
106 big_mdelay(750); 106 msleep(750);
107 snd_pmac_awacs_write_noreg(chip, 1, 107 snd_pmac_awacs_write_noreg(chip, 1,
108 chip->awacs_reg[1] | MASK_RECALIBRATE | MASK_CMUTE | MASK_AMUTE); 108 chip->awacs_reg[1] | MASK_RECALIBRATE | MASK_CMUTE | MASK_AMUTE);
109 snd_pmac_awacs_write_noreg(chip, 1, chip->awacs_reg[1]); 109 snd_pmac_awacs_write_noreg(chip, 1, chip->awacs_reg[1]);
@@ -653,10 +653,10 @@ static void snd_pmac_awacs_resume(pmac_t *chip)
653{ 653{
654 if (machine_is_compatible("PowerBook3,1") 654 if (machine_is_compatible("PowerBook3,1")
655 || machine_is_compatible("PowerBook3,2")) { 655 || machine_is_compatible("PowerBook3,2")) {
656 big_mdelay(100); 656 msleep(100);
657 snd_pmac_awacs_write_reg(chip, 1, 657 snd_pmac_awacs_write_reg(chip, 1,
658 chip->awacs_reg[1] & ~MASK_PAROUT); 658 chip->awacs_reg[1] & ~MASK_PAROUT);
659 big_mdelay(300); 659 msleep(300);
660 } 660 }
661 661
662 awacs_restore_all_regs(chip); 662 awacs_restore_all_regs(chip);