aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/trident
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/trident')
-rw-r--r--sound/pci/trident/trident_main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index ebbe12d78d8c..0d478871808d 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -52,8 +52,7 @@ static int snd_trident_pcm_mixer_build(struct snd_trident *trident,
52static int snd_trident_pcm_mixer_free(struct snd_trident *trident, 52static int snd_trident_pcm_mixer_free(struct snd_trident *trident,
53 struct snd_trident_voice * voice, 53 struct snd_trident_voice * voice,
54 struct snd_pcm_substream *substream); 54 struct snd_pcm_substream *substream);
55static irqreturn_t snd_trident_interrupt(int irq, void *dev_id, 55static irqreturn_t snd_trident_interrupt(int irq, void *dev_id);
56 struct pt_regs *regs);
57static int snd_trident_sis_reset(struct snd_trident *trident); 56static int snd_trident_sis_reset(struct snd_trident *trident);
58 57
59static void snd_trident_clear_voices(struct snd_trident * trident, 58static void snd_trident_clear_voices(struct snd_trident * trident,
@@ -3737,7 +3736,7 @@ static int snd_trident_free(struct snd_trident *trident)
3737 3736
3738 ---------------------------------------------------------------------------*/ 3737 ---------------------------------------------------------------------------*/
3739 3738
3740static irqreturn_t snd_trident_interrupt(int irq, void *dev_id, struct pt_regs *regs) 3739static irqreturn_t snd_trident_interrupt(int irq, void *dev_id)
3741{ 3740{
3742 struct snd_trident *trident = dev_id; 3741 struct snd_trident *trident = dev_id;
3743 unsigned int audio_int, chn_int, stimer, channel, mask, tmp; 3742 unsigned int audio_int, chn_int, stimer, channel, mask, tmp;
@@ -3825,7 +3824,7 @@ static irqreturn_t snd_trident_interrupt(int irq, void *dev_id, struct pt_regs *
3825 } 3824 }
3826 if (audio_int & MPU401_IRQ) { 3825 if (audio_int & MPU401_IRQ) {
3827 if (trident->rmidi) { 3826 if (trident->rmidi) {
3828 snd_mpu401_uart_interrupt(irq, trident->rmidi->private_data, regs); 3827 snd_mpu401_uart_interrupt(irq, trident->rmidi->private_data);
3829 } else { 3828 } else {
3830 inb(TRID_REG(trident, T4D_MPUR0)); 3829 inb(TRID_REG(trident, T4D_MPUR0));
3831 } 3830 }