aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-09-11 04:12:14 -0400
committerJaroslav Kysela <perex@perex.cz>2007-10-16 10:52:12 -0400
commitb875d650527e1980cc88b2731ac4c209d2e4a0ca (patch)
tree6625ab415821399bd031122fff59fb0e526e9d68 /sound
parent56f91585b48bb3ca8ec38b84c92d3df2a2f2bf66 (diff)
[ALSA] Fix thinko in cs4231 mce down check
The last patches to replace with schedule_timeout() don't work as expected. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/cs423x/cs4231_lib.c13
-rw-r--r--sound/sparc/cs4231.c13
2 files changed, 14 insertions, 12 deletions
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c
index 72cf77159083..a5eb9659b519 100644
--- a/sound/isa/cs423x/cs4231_lib.c
+++ b/sound/isa/cs423x/cs4231_lib.c
@@ -313,6 +313,7 @@ void snd_cs4231_mce_up(struct snd_cs4231 *chip)
313void snd_cs4231_mce_down(struct snd_cs4231 *chip) 313void snd_cs4231_mce_down(struct snd_cs4231 *chip)
314{ 314{
315 unsigned long flags; 315 unsigned long flags;
316 unsigned long end_time;
316 int timeout; 317 int timeout;
317 318
318 snd_cs4231_busy_wait(chip); 319 snd_cs4231_busy_wait(chip);
@@ -344,28 +345,28 @@ void snd_cs4231_mce_down(struct snd_cs4231 *chip)
344 snd_printdd("(1) jiffies = %lu\n", jiffies); 345 snd_printdd("(1) jiffies = %lu\n", jiffies);
345 346
346 /* check condition up to 250 ms */ 347 /* check condition up to 250 ms */
347 timeout = msecs_to_jiffies(250); 348 end_time = jiffies + msecs_to_jiffies(250);
348 while (snd_cs4231_in(chip, CS4231_TEST_INIT) & 349 while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
349 CS4231_CALIB_IN_PROGRESS) { 350 CS4231_CALIB_IN_PROGRESS) {
350 351
351 if (timeout <= 0) { 352 if (time_after(jiffies, end_time)) {
352 snd_printk(KERN_ERR "mce_down - " 353 snd_printk(KERN_ERR "mce_down - "
353 "auto calibration time out (2)\n"); 354 "auto calibration time out (2)\n");
354 return; 355 return;
355 } 356 }
356 timeout = schedule_timeout(timeout); 357 msleep(1);
357 } 358 }
358 359
359 snd_printdd("(2) jiffies = %lu\n", jiffies); 360 snd_printdd("(2) jiffies = %lu\n", jiffies);
360 361
361 /* check condition up to 100 ms */ 362 /* check condition up to 100 ms */
362 timeout = msecs_to_jiffies(100); 363 end_time = jiffies + msecs_to_jiffies(100);
363 while (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT) { 364 while (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT) {
364 if (timeout <= 0) { 365 if (time_after(jiffies, end_time)) {
365 snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n"); 366 snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
366 return; 367 return;
367 } 368 }
368 timeout = schedule_timeout(timeout); 369 msleep(1);
369 } 370 }
370 371
371 snd_printdd("(3) jiffies = %lu\n", jiffies); 372 snd_printdd("(3) jiffies = %lu\n", jiffies);
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index ab39860e2404..9785382a5f39 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -401,6 +401,7 @@ static void snd_cs4231_mce_up(struct snd_cs4231 *chip)
401static void snd_cs4231_mce_down(struct snd_cs4231 *chip) 401static void snd_cs4231_mce_down(struct snd_cs4231 *chip)
402{ 402{
403 unsigned long flags; 403 unsigned long flags;
404 unsigned long end_time;
404 int timeout; 405 int timeout;
405 406
406 spin_lock_irqsave(&chip->lock, flags); 407 spin_lock_irqsave(&chip->lock, flags);
@@ -431,30 +432,30 @@ static void snd_cs4231_mce_down(struct snd_cs4231 *chip)
431 msleep(1); 432 msleep(1);
432 433
433 /* check condition up to 250ms */ 434 /* check condition up to 250ms */
434 timeout = msecs_to_jiffies(250); 435 end_time = jiffies + msecs_to_jiffies(250);
435 while (snd_cs4231_in(chip, CS4231_TEST_INIT) & 436 while (snd_cs4231_in(chip, CS4231_TEST_INIT) &
436 CS4231_CALIB_IN_PROGRESS) { 437 CS4231_CALIB_IN_PROGRESS) {
437 438
438 spin_unlock_irqrestore(&chip->lock, flags); 439 spin_unlock_irqrestore(&chip->lock, flags);
439 if (timeout <= 0) { 440 if (time_after(jiffies, end_time)) {
440 snd_printk("mce_down - " 441 snd_printk("mce_down - "
441 "auto calibration time out (2)\n"); 442 "auto calibration time out (2)\n");
442 return; 443 return;
443 } 444 }
444 timeout = schedule_timeout(timeout); 445 msleep(1);
445 spin_lock_irqsave(&chip->lock, flags); 446 spin_lock_irqsave(&chip->lock, flags);
446 } 447 }
447 448
448 /* check condition up to 100ms */ 449 /* check condition up to 100ms */
449 timeout = msecs_to_jiffies(100); 450 end_time = jiffies + msecs_to_jiffies(100);
450 while (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT) { 451 while (__cs4231_readb(chip, CS4231U(chip, REGSEL)) & CS4231_INIT) {
451 spin_unlock_irqrestore(&chip->lock, flags); 452 spin_unlock_irqrestore(&chip->lock, flags);
452 if (timeout <= 0) { 453 if (time_after(jiffies, end_time)) {
453 snd_printk("mce_down - " 454 snd_printk("mce_down - "
454 "auto calibration time out (3)\n"); 455 "auto calibration time out (3)\n");
455 return; 456 return;
456 } 457 }
457 timeout = schedule_timeout(timeout); 458 msleep(1);
458 spin_lock_irqsave(&chip->lock, flags); 459 spin_lock_irqsave(&chip->lock, flags);
459 } 460 }
460 spin_unlock_irqrestore(&chip->lock, flags); 461 spin_unlock_irqrestore(&chip->lock, flags);