diff options
Diffstat (limited to 'sound/pcmcia')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.h | 2 | ||||
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h index 9a14a4f64bd3..206e2f5a113f 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.h +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h | |||
@@ -138,7 +138,7 @@ int snd_pdacf_suspend(struct snd_pdacf *chip, pm_message_t state); | |||
138 | int snd_pdacf_resume(struct snd_pdacf *chip); | 138 | int snd_pdacf_resume(struct snd_pdacf *chip); |
139 | #endif | 139 | #endif |
140 | int snd_pdacf_pcm_new(struct snd_pdacf *chip); | 140 | int snd_pdacf_pcm_new(struct snd_pdacf *chip); |
141 | irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs); | 141 | irqreturn_t pdacf_interrupt(int irq, void *dev); |
142 | void pdacf_tasklet(unsigned long private_data); | 142 | void pdacf_tasklet(unsigned long private_data); |
143 | void pdacf_reinit(struct snd_pdacf *chip, int resume); | 143 | void pdacf_reinit(struct snd_pdacf *chip, int resume); |
144 | 144 | ||
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c index 7c5f21e45cb4..732263e4a437 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | |||
@@ -26,7 +26,7 @@ | |||
26 | /* | 26 | /* |
27 | * | 27 | * |
28 | */ | 28 | */ |
29 | irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs) | 29 | irqreturn_t pdacf_interrupt(int irq, void *dev) |
30 | { | 30 | { |
31 | struct snd_pdacf *chip = dev; | 31 | struct snd_pdacf *chip = dev; |
32 | unsigned short stat; | 32 | unsigned short stat; |
@@ -45,7 +45,7 @@ irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs) | |||
45 | if (!(stat & PDAUDIOCF_IRQAKM)) | 45 | if (!(stat & PDAUDIOCF_IRQAKM)) |
46 | stat |= PDAUDIOCF_IRQAKM; /* check rate */ | 46 | stat |= PDAUDIOCF_IRQAKM; /* check rate */ |
47 | } | 47 | } |
48 | if (regs != NULL) | 48 | if (get_irq_regs() != NULL) |
49 | snd_ak4117_check_rate_and_errors(chip->ak4117, 0); | 49 | snd_ak4117_check_rate_and_errors(chip->ak4117, 0); |
50 | return IRQ_HANDLED; | 50 | return IRQ_HANDLED; |
51 | } | 51 | } |