summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1 at wp.pl>2007-09-11 02:40:42 +0400
committerJaroslav Kysela <perex@perex.cz>2007-10-16 18:49:29 +0400
commit23d4635ed336c7dadb3590ee7d275ac612f06ebf (patch)
treee5ec9aa22fb992fe51fa059f14ab581cc8503f66
parent503fc85a3b15b0e939ad9672e376ffc9c4840591 (diff)
downloadlinux-23d4635ed336c7dadb3590ee7d275ac612f06ebf.tar.xz
[ALSA] cs4231-lib: improved waiting after mce_down
This patch replaces long msleeps in waiting loops with schedule_timeout() calls. Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r--sound/isa/cs423x/cs4231_lib.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c
index c0ffb20da996..e73554feccd5 100644
--- a/sound/isa/cs423x/cs4231_lib.c
+++ b/sound/isa/cs423x/cs4231_lib.c
@@ -343,26 +343,29 @@ void snd_cs4231_mce_down(struct snd_cs4231 *chip)
snd_printdd("(1) jiffies = %lu\n", jiffies);
- /* in 10 ms increments, check condition, up to 250 ms */
- timeout = 25;
- while (snd_cs4231_in(chip, CS4231_TEST_INIT) & CS4231_CALIB_IN_PROGRESS) {
- if (--timeout < 0) {
- snd_printk("mce_down - auto calibration time out (2)\n");
+ /* check condition up to 250 ms */
+ timeout = msecs_to_jiffies(250);
+ while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
+ CS4231_CALIB_IN_PROGRESS) {
+
+ if (timeout <= 0) {
+ snd_printk(KERN_ERR "mce_down - "
+ "auto calibration time out (2)\n");
return;
}
- msleep(10);
+ timeout = schedule_timeout(timeout);
}
snd_printdd("(2) jiffies = %lu\n", jiffies);
- /* in 10 ms increments, check condition, up to 100 ms */
- timeout = 10;
+ /* check condition up to 100 ms */
+ timeout = msecs_to_jiffies(100);
while (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT) {
- if (--timeout < 0) {
+ if (timeout <= 0) {
snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
return;
}
- msleep(10);
+ timeout = schedule_timeout(timeout);
}
snd_printdd("(3) jiffies = %lu\n", jiffies);