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/mixart | |
| parent | 072c01194df6e4843582d09380b780987f642d6d (diff) | |
| download | blackbird-op-linux-ef21ca24faf28df6d06939e77d5032a313490289.tar.gz blackbird-op-linux-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/mixart')
| -rw-r--r-- | sound/pci/mixart/mixart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 082c0d0f73d2..6c868d913634 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c @@ -445,9 +445,9 @@ static int snd_mixart_trigger(snd_pcm_substream_t *subs, int cmd) static int mixart_sync_nonblock_events(mixart_mgr_t *mgr) { - int timeout = HZ; + unsigned long timeout = jiffies + HZ; while (atomic_read(&mgr->msg_processed) > 0) { - if (! timeout--) { + if (time_after(jiffies, timeout)) { snd_printk(KERN_ERR "mixart: cannot process nonblock events!\n"); return -EBUSY; } |
