diff options
| author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-07-09 10:13:22 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-07-28 12:22:13 +0200 |
| commit | ef21ca24faf28df6d06939e77d5032a313490289 (patch) | |
| tree | 1c6c719f4671b803f1288eb8cdca18587ec2eb62 /sound/pci/ens1370.c | |
| parent | 072c01194df6e4843582d09380b780987f642d6d (diff) | |
| download | linux-3.10-ef21ca24faf28df6d06939e77d5032a313490289.tar.gz linux-3.10-ef21ca24faf28df6d06939e77d5032a313490289.tar.bz2 linux-3.10-ef21ca24faf28df6d06939e77d5032a313490289.zip | |
[ALSA] sound/pci: fix-up sleeping paths
ENS1370/1+ driver,ES1968 driver,Intel8x0 driver,VIA82xx driver
VIA82xx-modem driver,AC97 Codec,ALI5451 driver,CS46xx driver
MIXART driver,RME HDSP driver,Trident driver,YMFPCI driver
Description: Fix-up sleeping in sound/pci. These changes fall under the
following two categories:
1) Replace schedule_timeout() with msleep() to guarantee the
task delays as expected. This also involved replacing/removing
custom sleep functions.
2) Do not assume jiffies will only increment by one if you
request a 1 jiffy sleep, i.e. use time_after/time_before in
while loops.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/ens1370.c')
| -rw-r--r-- | sound/pci/ens1370.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index d4287338c04..78a81f3912a 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c @@ -2018,21 +2018,11 @@ static int __devinit snd_ensoniq_create(snd_card_t * card, if (pci->vendor == es1371_ac97_reset_hack[idx].vid && pci->device == es1371_ac97_reset_hack[idx].did && ensoniq->rev == es1371_ac97_reset_hack[idx].rev) { - unsigned long tmo; - signed long tmo2; - ensoniq->cssr |= ES_1371_ST_AC97_RST; outl(ensoniq->cssr, ES_REG(ensoniq, STATUS)); /* need to delay around 20ms(bleech) to give some CODECs enough time to wakeup */ - tmo = jiffies + (HZ / 50) + 1; - while (1) { - tmo2 = tmo - jiffies; - if (tmo2 <= 0) - break; - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(tmo2); - } + msleep(20); break; } /* AC'97 warm reset to start the bitclk */ |