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

Commit d86d0193 authored by Rene Herman's avatar Rene Herman Committed by Jaroslav Kysela
Browse files

[ALSA] alsa-kernel: schedule_timeout() fixes 



Fix schedule_timeout() use in alsa-kernel. Mostly just
	schedule_timeout(1) --> schedule_timeout_uninterruptible(1)
The wavefront_synth one fixes the surrounding loop as well. In ymfpci_main,
delete a superfluous set_current_state() and in soc/soc-dapm.c replace an
_interruptible with _uninterruptible in some debug code; it's not waiting
for signals.

Signed-off-by: Rene Herman <rene.herman>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent b44ef2f1

sound/isa/sscape.c

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout) 
		unsigned long flags;

		unsigned char x;



		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);



		spin_lock_irqsave(&s->lock, flags);

		x = inb(HOST_DATA_IO(s->io_base));
@@ -428,7 +428,7 @@ static int host_startup_ack(struct soundscape *s, unsigned timeout) 
		unsigned long flags;

		unsigned char x;



		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);



		spin_lock_irqsave(&s->lock, flags);

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

sound/isa/wavefront/wavefront_synth.c

+4 −6
Original line number Diff line number Diff line
@@ -1768,7 +1768,7 @@ snd_wavefront_interrupt_bits (int irq) 


static void __devinit

wavefront_should_cause_interrupt (snd_wavefront_t *dev, 

				  int val, int port, int timeout)

				  int val, int port, unsigned long timeout)



{

	wait_queue_t wait;
@@ -1779,11 +1779,9 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev, 
	dev->irq_ok = 0;

	outb (val,port);

	spin_unlock_irq(&dev->irq_lock);

	while (1) {

		if ((timeout = schedule_timeout(timeout)) == 0)

			return;

		if (dev->irq_ok)

			return;

	while (!dev->irq_ok && time_before(jiffies, timeout)) {

		schedule_timeout_uninterruptible(1);

		barrier();

	}

}

sound/pci/hda/hda_intel.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec) 
		}

		if (!chip->rirb.cmds)

			return chip->rirb.res; /* the last value */

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while (time_after_eq(timeout, jiffies));



	if (chip->msi) {

sound/pci/via82xx.c

+2 −2
Original line number Diff line number Diff line
@@ -2090,7 +2090,7 @@ static int snd_via82xx_chip_init(struct via82xx *chip) 
		pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);

		if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */

			break;

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while (time_before(jiffies, end_time));



	if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
@@ -2109,7 +2109,7 @@ static int snd_via82xx_chip_init(struct via82xx *chip) 
			chip->ac97_secondary = 1;

			goto __ac97_ok2;

		}

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while (time_before(jiffies, end_time));

	/* This is ok, the most of motherboards have only one codec */

sound/pci/via82xx_modem.c

+2 −2
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ static int snd_via82xx_chip_init(struct via82xx_modem *chip) 
		pci_read_config_byte(chip->pci, VIA_ACLINK_STAT, &pval);

		if (pval & VIA_ACLINK_C00_READY) /* primary codec ready */

			break;

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while (time_before(jiffies, end_time));



	if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
@@ -1001,7 +1001,7 @@ static int snd_via82xx_chip_init(struct via82xx_modem *chip) 
			chip->ac97_secondary = 1;

			goto __ac97_ok2;

		}

		schedule_timeout(1);

		schedule_timeout_uninterruptible(1);

	} while (time_before(jiffies, end_time));

	/* This is ok, the most of motherboards have only one codec */