aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sscape.c
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/sscape.c
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/sscape.c')
-rw-r--r--sound/isa/sscape.c4
1 files changed, 2 insertions, 2 deletions
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));