aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-06-25 06:09:32 -0400
committerJaroslav Kysela <perex@suse.cz>2007-07-20 05:11:36 -0400
commite65365de5ba280e058bd6b8b80c8790253268887 (patch)
tree8ce89e16bd1519b620c52c407511c30f3af391f3 /sound/isa
parentc12aad6efbee1d937438f1deabbef695add0628b (diff)
[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>
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/ad1848/ad1848_lib.c4
-rw-r--r--sound/isa/sscape.c4
-rw-r--r--sound/isa/wavefront/wavefront_synth.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index 8094282c2ae1..1bc2e3fd5721 100644
--- a/sound/isa/ad1848/ad1848_lib.c
+++ b/sound/isa/ad1848/ad1848_lib.c
@@ -245,7 +245,7 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
245 snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n"); 245 snd_printk(KERN_ERR "mce_down - auto calibration time out (2)\n");
246 return; 246 return;
247 } 247 }
248 time = schedule_timeout_interruptible(time); 248 time = schedule_timeout(time);
249 spin_lock_irqsave(&chip->reg_lock, flags); 249 spin_lock_irqsave(&chip->reg_lock, flags);
250 } 250 }
251#if 0 251#if 0
@@ -258,7 +258,7 @@ static void snd_ad1848_mce_down(struct snd_ad1848 *chip)
258 snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n"); 258 snd_printk(KERN_ERR "mce_down - auto calibration time out (3)\n");
259 return; 259 return;
260 } 260 }
261 time = schedule_timeout_interruptible(time); 261 time = schedule_timeout(time);
262 spin_lock_irqsave(&chip->reg_lock, flags); 262 spin_lock_irqsave(&chip->reg_lock, flags);
263 } 263 }
264 spin_unlock_irqrestore(&chip->reg_lock, flags); 264 spin_unlock_irqrestore(&chip->reg_lock, flags);
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 9ea417bcf3e5..cbad2a51cbaa 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -382,7 +382,7 @@ static int obp_startup_ack(struct soundscape *s, unsigned timeout)
382 unsigned long flags; 382 unsigned long flags;
383 unsigned char x; 383 unsigned char x;
384 384
385 schedule_timeout_interruptible(1); 385 schedule_timeout(1);
386 386
387 spin_lock_irqsave(&s->lock, flags); 387 spin_lock_irqsave(&s->lock, flags);
388 x = inb(HOST_DATA_IO(s->io_base)); 388 x = inb(HOST_DATA_IO(s->io_base));
@@ -409,7 +409,7 @@ static int host_startup_ack(struct soundscape *s, unsigned timeout)
409 unsigned long flags; 409 unsigned long flags;
410 unsigned char x; 410 unsigned char x;
411 411
412 schedule_timeout_interruptible(1); 412 schedule_timeout(1);
413 413
414 spin_lock_irqsave(&s->lock, flags); 414 spin_lock_irqsave(&s->lock, flags);
415 x = inb(HOST_DATA_IO(s->io_base)); 415 x = inb(HOST_DATA_IO(s->io_base));
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 78020d832e04..bacc51c86587 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1780,7 +1780,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev,
1780 outb (val,port); 1780 outb (val,port);
1781 spin_unlock_irq(&dev->irq_lock); 1781 spin_unlock_irq(&dev->irq_lock);
1782 while (1) { 1782 while (1) {
1783 if ((timeout = schedule_timeout_interruptible(timeout)) == 0) 1783 if ((timeout = schedule_timeout(timeout)) == 0)
1784 return; 1784 return;
1785 if (dev->irq_ok) 1785 if (dev->irq_ok)
1786 return; 1786 return;