2 files changed, 14 insertions, 17 deletions

diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index f01e564b1238..d454d11989f0 100644
--- a/sound/isa/ad1848/ad1848_lib.c
+++ b/sound/isa/ad1848/ad1848_lib.c
@@ -229,16 +229,15 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
                 spin_unlock_irqrestore(&chip->reg_lock, flags);
                 return;
         }
-        /* calibration process */
 
-        for (timeout = 500; timeout > 0 && (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) == 0; timeout--);
-        if ((snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) == 0) {
-                snd_printd("mce_down - auto calibration time out (1)\n");
-                spin_unlock_irqrestore(&chip->reg_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);
 #if 0
-        printk("(2) timeout = %i, jiffies = %li\n", timeout, jiffies);
+        printk("(2) jiffies = %li\n", jiffies);
 #endif
         time = HZ / 4;
         while (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) {
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c
index db9bba130b28..0e604bf6bbee 100644
--- a/sound/isa/cs423x/cs4231_lib.c
+++ b/sound/isa/cs423x/cs4231_lib.c
@@ -336,16 +336,14 @@ void snd_cs4231_mce_down(struct snd_cs4231 *chip)
         }
         snd_cs4231_busy_wait(chip);
 
-        /* calibration process */
-
-        for (timeout = 500; timeout > 0 && (snd_cs4231_in(chip, CS4231_TEST_INIT) & CS4231_CALIB_IN_PROGRESS) == 0; timeout--)
-                udelay(10);
-        if ((snd_cs4231_in(chip, CS4231_TEST_INIT) & CS4231_CALIB_IN_PROGRESS) == 0) {
-                snd_printd("cs4231_mce_down - auto calibration time out (1)\n");
-                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);
 #if 0
-        printk("(2) timeout = %i, jiffies = %li\n", timeout, jiffies);
+        printk("(2) jiffies = %li\n", jiffies);
 #endif
         /* in 10 ms increments, check condition, up to 250 ms */
         timeout = 25;