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
/
pcmcia
/
pdaudiocf
/
pdaudiocf_irq.c
diff --git
a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
index
7c5f21e
..
5bd6920
100644
(file)
--- a/
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
+++ b/
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c
@@
-22,11
+22,12
@@
#include <sound/core.h>
#include "pdaudiocf.h"
#include <sound/initval.h>
#include <sound/core.h>
#include "pdaudiocf.h"
#include <sound/initval.h>
+#include <asm/irq_regs.h>
/*
*
*/
/*
*
*/
-irqreturn_t pdacf_interrupt(int irq, void *dev
, struct pt_regs *regs
)
+irqreturn_t pdacf_interrupt(int irq, void *dev)
{
struct snd_pdacf *chip = dev;
unsigned short stat;
{
struct snd_pdacf *chip = dev;
unsigned short stat;
@@
-45,7
+46,7
@@
irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs)
if (!(stat & PDAUDIOCF_IRQAKM))
stat |= PDAUDIOCF_IRQAKM; /* check rate */
}
if (!(stat & PDAUDIOCF_IRQAKM))
stat |= PDAUDIOCF_IRQAKM; /* check rate */
}
- if (
regs
!= NULL)
+ if (
get_irq_regs()
!= NULL)
snd_ak4117_check_rate_and_errors(chip->ak4117, 0);
return IRQ_HANDLED;
}
snd_ak4117_check_rate_and_errors(chip->ak4117, 0);
return IRQ_HANDLED;
}