aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-09-11 00:55:46 +0200
committerJaroslav Kysela <perex@perex.cz>2007-10-16 16:52:05 +0200
commit56f91585b48bb3ca8ec38b84c92d3df2a2f2bf66 (patch)
tree93032e199ed4bcb11146effb1ec59c5025e1c9d1 /sound
parent7e52f3dac7fe08ae7c3e82178c95a43aa0911c33 (diff)
[ALSA] sun-cs4231: improved waiting after MCE down
This patch sync sparc driver with x86 isa cs4231 driver patches. It fixes wrong waiting for the auto calibration bit and makes further waiting use much finer granularity. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/sparc/cs4231.c33
1 files changed, 14 insertions, 19 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 4f515a64e03..ab39860e240 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -422,44 +422,39 @@ static void snd_cs4231_mce_down(struct snd_cs4231 *chip)
spin_unlock_irqrestore(&chip->lock, flags);
return;
}
- snd_cs4231_busy_wait(chip);
-
- /* calibration process */
- snd_cs4231_ready(chip);
- snd_cs4231_ready(chip);
- timeout = snd_cs4231_in(chip, CS4231_TEST_INIT);
- if ((timeout & CS4231_CALIB_IN_PROGRESS) == 0) {
- snd_printd("cs4231_mce_down - auto calibration time out (1)\n");
- spin_unlock_irqrestore(&chip->lock, flags);
- return;
- }
+ /*
+ * Wait for (possible -- during init auto-calibration may not be set)
+ * calibration process to start. Needs upto 5 sample periods on AD1848
+ * which at the slowest possible rate of 5.5125 kHz means 907 us.
+ */
+ msleep(1);
- /* in 10ms increments, check condition, up to 250ms */
- timeout = 25;
+ /* check condition up to 250ms */
+ timeout = msecs_to_jiffies(250);
while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
CS4231_CALIB_IN_PROGRESS) {
spin_unlock_irqrestore(&chip->lock, flags);
- if (--timeout < 0) {
+ if (timeout <= 0) {
snd_printk("mce_down - "
"auto calibration time out (2)\n");
return;
}
- msleep(10);
+ timeout = schedule_timeout(timeout);
spin_lock_irqsave(&chip->lock, flags);
}
- /* in 10ms increments, check condition, up to 100ms */
- timeout = 10;
+ /* check condition up to 100ms */
+ timeout = msecs_to_jiffies(100);
while (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT) {
spin_unlock_irqrestore(&chip->lock, flags);
- if (--timeout < 0) {
+ if (timeout <= 0) {
snd_printk("mce_down - "
"auto calibration time out (3)\n");
return;
}
- msleep(10);
+ timeout = schedule_timeout(timeout);
spin_lock_irqsave(&chip->lock, flags);
}
spin_unlock_irqrestore(&chip->lock, flags);