aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/es1938.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/es1938.c')
-rw-r--r--sound/pci/es1938.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 3ce5a4e7e31f..2da988f78ba7 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -241,7 +241,7 @@ struct es1938 {
241#endif 241#endif
242}; 242};
243 243
244static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs); 244static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id);
245 245
246static struct pci_device_id snd_es1938_ids[] = { 246static struct pci_device_id snd_es1938_ids[] = {
247 { 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */ 247 { 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */
@@ -1642,7 +1642,7 @@ static int __devinit snd_es1938_create(struct snd_card *card,
1642/* -------------------------------------------------------------------- 1642/* --------------------------------------------------------------------
1643 * Interrupt handler 1643 * Interrupt handler
1644 * -------------------------------------------------------------------- */ 1644 * -------------------------------------------------------------------- */
1645static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *regs) 1645static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id)
1646{ 1646{
1647 struct es1938 *chip = dev_id; 1647 struct es1938 *chip = dev_id;
1648 unsigned char status, audiostatus; 1648 unsigned char status, audiostatus;
@@ -1714,7 +1714,7 @@ static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id, struct pt_regs *r
1714 // snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0); /* ack? */ 1714 // snd_es1938_mixer_bits(chip, ESSSB_IREG_MPU401CONTROL, 0x40, 0); /* ack? */
1715 if (chip->rmidi) { 1715 if (chip->rmidi) {
1716 handled = 1; 1716 handled = 1;
1717 snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs); 1717 snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data);
1718 } 1718 }
1719 } 1719 }
1720 return IRQ_RETVAL(handled); 1720 return IRQ_RETVAL(handled);