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

Commit 554b91ed authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Takashi Iwai
Browse files

ALSA: sscape: fix incorrect timeout after microcode upload 



A comment states that one should wait up to 5 secs
while a waiting loop waits only 5 system ticks.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 199f7978

sound/isa/sscape.c

+12 −12
Original line number Diff line number Diff line
@@ -393,20 +393,20 @@ static int sscape_wait_dma_unsafe(unsigned io_base, enum GA_REG reg, unsigned ti 
 */

static int obp_startup_ack(struct soundscape *s, unsigned timeout)

{

	while (timeout != 0) {

	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);



	do {

		unsigned long flags;

		unsigned char x;



		schedule_timeout_uninterruptible(1);



		spin_lock_irqsave(&s->lock, flags);

		x = inb(HOST_DATA_IO(s->io_base));

		spin_unlock_irqrestore(&s->lock, flags);

		if ((x & 0xfe) == 0xfe)

			return 1;



		--timeout;

	} /* while */

		msleep(10);

	} while (time_before(jiffies, end_time));



	return 0;

}
@@ -420,20 +420,20 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout) 
 */

static int host_startup_ack(struct soundscape *s, unsigned timeout)

{

	while (timeout != 0) {

	unsigned long end_time = jiffies + msecs_to_jiffies(timeout);



	do {

		unsigned long flags;

		unsigned char x;



		schedule_timeout_uninterruptible(1);



		spin_lock_irqsave(&s->lock, flags);

		x = inb(HOST_DATA_IO(s->io_base));

		spin_unlock_irqrestore(&s->lock, flags);

		if (x == 0xfe)

			return 1;



		--timeout;

	} /* while */

		msleep(10);

	} while (time_before(jiffies, end_time));



	return 0;

}
@@ -529,10 +529,10 @@ static int upload_dma_data(struct soundscape *s, 
	 * give it 5 seconds (max) ...

	 */

	ret = 0;

	if (!obp_startup_ack(s, 5)) {

	if (!obp_startup_ack(s, 5000)) {

		snd_printk(KERN_ERR "sscape: No response from on-board processor after upload\n");

		ret = -EAGAIN;

	} else if (!host_startup_ack(s, 5)) {

	} else if (!host_startup_ack(s, 5000)) {

		snd_printk(KERN_ERR "sscape: SoundScape failed to initialise\n");

		ret = -EAGAIN;

	}