projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] SC6000 driver - add HAS_IOPORT dependency
[powerpc.git]
/
sound
/
isa
/
sscape.c
diff --git
a/sound/isa/sscape.c
b/sound/isa/sscape.c
index
9ea417b
..
cbad2a5
100644
(file)
--- a/
sound/isa/sscape.c
+++ b/
sound/isa/sscape.c
@@
-382,7
+382,7
@@
static int obp_startup_ack(struct soundscape *s, unsigned timeout)
unsigned long flags;
unsigned char x;
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));
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;
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));
spin_lock_irqsave(&s->lock, flags);
x = inb(HOST_DATA_IO(s->io_base));