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
/
pci
/
echoaudio
/
echoaudio.c
diff --git
a/sound/pci/echoaudio/echoaudio.c
b/sound/pci/echoaudio/echoaudio.c
index
c3dafa2
..
047e0b5
100644
(file)
--- a/
sound/pci/echoaudio/echoaudio.c
+++ b/
sound/pci/echoaudio/echoaudio.c
@@
-1818,8
+1818,7
@@
static struct snd_kcontrol_new snd_echo_channels_info __devinitdata = {
IRQ Handler
******************************************************************************/
IRQ Handler
******************************************************************************/
-static irqreturn_t snd_echo_interrupt(int irq, void *dev_id,
- struct pt_regs *regs)
+static irqreturn_t snd_echo_interrupt(int irq, void *dev_id)
{
struct echoaudio *chip = dev_id;
struct snd_pcm_substream *substream;
{
struct echoaudio *chip = dev_id;
struct snd_pcm_substream *substream;
@@
-1873,7
+1872,7
@@
static int snd_echo_free(struct echoaudio *chip)
DE_INIT(("Stopped.\n"));
if (chip->irq >= 0)
DE_INIT(("Stopped.\n"));
if (chip->irq >= 0)
- free_irq(chip->irq,
(void *)
chip);
+ free_irq(chip->irq, chip);
if (chip->dsp_registers)
iounmap(chip->dsp_registers);
if (chip->dsp_registers)
iounmap(chip->dsp_registers);
@@
-1951,8
+1950,8
@@
static __devinit int snd_echo_create(struct snd_card *card,
chip->dsp_registers = (volatile u32 __iomem *)
ioremap_nocache(chip->dsp_registers_phys, sz);
chip->dsp_registers = (volatile u32 __iomem *)
ioremap_nocache(chip->dsp_registers_phys, sz);
- if (request_irq(pci->irq, snd_echo_interrupt, IRQF_
DISABLED | IRQF_
SHARED,
-
ECHOCARD_NAME, (void *)
chip)) {
+ if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
+
ECHOCARD_NAME,
chip)) {
snd_echo_free(chip);
snd_printk(KERN_ERR "cannot grab irq\n");
return -EBUSY;
snd_echo_free(chip);
snd_printk(KERN_ERR "cannot grab irq\n");
return -EBUSY;