[ALSA] Fix invalid schedule_timeout_interruptible()
Fixed the invalid use of schedule_timeout_interruptible() without checking pending signals. Simply replaced with schedule_timeout(). Suggestions thanks to Jeff Garzik. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Родитель
c12aad6efb
Коммит
e65365de5b
|
@ -109,7 +109,7 @@ void snd_seq_instr_list_free(struct snd_seq_kinstr_list **list_ptr)
|
|||
spin_lock_irqsave(&list->lock, flags);
|
||||
while (instr->use) {
|
||||
spin_unlock_irqrestore(&list->lock, flags);
|
||||
schedule_timeout_interruptible(1);
|
||||
schedule_timeout(1);
|
||||
spin_lock_irqsave(&list->lock, flags);
|
||||
}
|
||||
spin_unlock_irqrestore(&list->lock, flags);
|
||||
|
@ -199,7 +199,7 @@ int snd_seq_instr_list_free_cond(struct snd_seq_kinstr_list *list,
|
|||
instr = flist;
|
||||
flist = instr->next;
|
||||
while (instr->use)
|
||||
schedule_timeout_interruptible(1);
|
||||
schedule_timeout(1);
|
||||
if (snd_seq_instr_free(instr, atomic)<0)
|
||||
snd_printk(KERN_WARNING "instrument free problem\n");
|
||||
instr = next;
|
||||
|
@ -555,7 +555,7 @@ static int instr_free(struct snd_seq_kinstr_ops *ops,
|
|||
SNDRV_SEQ_INSTR_NOTIFY_REMOVE);
|
||||
while (instr->use) {
|
||||
spin_unlock_irqrestore(&list->lock, flags);
|
||||
schedule_timeout_interruptible(1);
|
||||
schedule_timeout(1);
|
||||
spin_lock_irqsave(&list->lock, flags);
|
||||
}
|
||||
spin_unlock_irqrestore(&list->lock, flags);
|
||||
|
|
|
@ -245,7 +245,7 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
|
|||
snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n");
|
||||
return;
|
||||
}
|
||||
time = schedule_timeout_interruptible(time);
|
||||
time = schedule_timeout(time);
|
||||
spin_lock_irqsave(&chip->reg_lock, flags);
|
||||
}
|
||||
#if 0
|
||||
|
@ -258,7 +258,7 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
|
|||
snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
|
||||
return;
|
||||
}
|
||||
time = schedule_timeout_interruptible(time);
|
||||
time = schedule_timeout(time);
|
||||
spin_lock_irqsave(&chip->reg_lock, flags);
|
||||
}
|
||||
spin_unlock_irqrestore(&chip->reg_lock, flags);
|
||||
|
|
|
@ -382,7 +382,7 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)
|
|||
unsigned long flags;
|
||||
unsigned char x;
|
||||
|
||||
schedule_timeout_interruptible(1);
|
||||
schedule_timeout(1);
|
||||
|
||||
spin_lock_irqsave(&s->lock, flags);
|
||||
x = inb(HOST_DATA_IO(s->io_base));
|
||||
|
@ -409,7 +409,7 @@ static int host_startup_ack(struct soundscape *s, unsigned timeout)
|
|||
unsigned long flags;
|
||||
unsigned char x;
|
||||
|
||||
schedule_timeout_interruptible(1);
|
||||
schedule_timeout(1);
|
||||
|
||||
spin_lock_irqsave(&s->lock, flags);
|
||||
x = inb(HOST_DATA_IO(s->io_base));
|
||||
|
|
|
@ -1780,7 +1780,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev,
|
|||
outb (val,port);
|
||||
spin_unlock_irq(&dev->irq_lock);
|
||||
while (1) {
|
||||
if ((timeout = schedule_timeout_interruptible(timeout)) == 0)
|
||||
if ((timeout = schedule_timeout(timeout)) == 0)
|
||||
return;
|
||||
if (dev->irq_ok)
|
||||
return;
|
||||
|
|
|
@ -538,7 +538,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_interruptible(1);
|
||||
schedule_timeout(1);
|
||||
} while (time_after_eq(timeout, jiffies));
|
||||
|
||||
if (chip->msi) {
|
||||
|
|
|
@ -2098,7 +2098,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_uninterruptible(1);
|
||||
schedule_timeout(1);
|
||||
} while (time_before(jiffies, end_time));
|
||||
|
||||
if ((val = snd_via82xx_codec_xread(chip)) & VIA_REG_AC97_BUSY)
|
||||
|
@ -2117,7 +2117,7 @@ static int snd_via82xx_chip_init(struct via82xx *chip)
|
|||
chip->ac97_secondary = 1;
|
||||
goto __ac97_ok2;
|
||||
}
|
||||
schedule_timeout_interruptible(1);
|
||||
schedule_timeout(1);
|
||||
} while (time_before(jiffies, end_time));
|
||||
/* This is ok, the most of motherboards have only one codec */
|
||||
|
||||
|
|
|
@ -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_uninterruptible(1);
|
||||
schedule_timeout(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_interruptible(1);
|
||||
schedule_timeout(1);
|
||||
} while (time_before(jiffies, end_time));
|
||||
/* This is ok, the most of motherboards have only one codec */
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче