git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
isa
/
es1688
/
es1688_lib.c
diff --git
a/sound/isa/es1688/es1688_lib.c
b/sound/isa/es1688/es1688_lib.c
index
702ad51
..
a2ab99f
100644
(file)
--- a/
sound/isa/es1688/es1688_lib.c
+++ b/
sound/isa/es1688/es1688_lib.c
@@
-479,7
+479,7
@@
static int snd_es1688_capture_trigger(struct snd_pcm_substream *substream,
return snd_es1688_trigger(chip, cmd, 0x0f);
}
return snd_es1688_trigger(chip, cmd, 0x0f);
}
-static irqreturn_t snd_es1688_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t snd_es1688_interrupt(int irq, void *dev_id)
{
struct snd_es1688 *chip = dev_id;
{
struct snd_es1688 *chip = dev_id;
@@
-659,7
+659,7
@@
int snd_es1688_create(struct snd_card *card,
snd_es1688_free(chip);
return -EBUSY;
}
snd_es1688_free(chip);
return -EBUSY;
}
- if (request_irq(irq, snd_es1688_interrupt,
SA_INTERRUPT
, "ES1688", (void *) chip)) {
+ if (request_irq(irq, snd_es1688_interrupt,
IRQF_DISABLED
, "ES1688", (void *) chip)) {
snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
snd_es1688_free(chip);
return -EBUSY;
snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
snd_es1688_free(chip);
return -EBUSY;