Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7941520 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Jaroslav Kysela
Browse files

[ALSA] ad1848_lib: waiting loops done after cs4231_lib 



This patch fixes ad1848_lib waiting loops to be the same as in the cs4231_lib.
Acked-by: default avatarRene Herman <rene.herman@gmail.com>

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 3a5bdee5

sound/isa/ad1848/ad1848_lib.c

+7 −7
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip) 
{

	unsigned long flags;

	int timeout;

	signed long time;

	unsigned long end_time;



	spin_lock_irqsave(&chip->reg_lock, flags);

	for (timeout = 5; timeout > 0; timeout--)
@@ -240,27 +240,27 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip) 


	snd_printdd("(2) jiffies = %lu\n", jiffies);



	time = msecs_to_jiffies(250);

	end_time = jiffies + msecs_to_jiffies(250);

	while (snd_ad1848_in(chip, AD1848_TEST_INIT) & AD1848_CALIB_IN_PROGRESS) {

		spin_unlock_irqrestore(&chip->reg_lock, flags);

		if (time <= 0) {

		if (time_after(jiffies, end_time)) {

			snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n");

			return;

		}

		time = schedule_timeout(time);

		msleep(1);

		spin_lock_irqsave(&chip->reg_lock, flags);

	}



	snd_printdd("(3) jiffies = %lu\n", jiffies);



	time = msecs_to_jiffies(100);

	end_time = jiffies + msecs_to_jiffies(100);

	while (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) {

		spin_unlock_irqrestore(&chip->reg_lock, flags);

		if (time <= 0) {

		if (time_after(jiffies, end_time)) {

			snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");

			return;

		}

		time = schedule_timeout(time);

		msleep(1);

		spin_lock_irqsave(&chip->reg_lock, flags);

	}

	spin_unlock_irqrestore(&chip->reg_lock, flags);