Merge tag 'regmap/range' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[~andy/linux] / sound / oss / uart6850.c

diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c
index 74ae75f9e2dc40e132a6b5e65a9fd68014698c30..1079133dd6ab17fc856677a328ea54563028c555 100644 (file)
--- a/sound/oss/uart6850.c
+++ b/sound/oss/uart6850.c
@@ -1,5 +1,5 @@
 /*
- * sound/uart6850.c
+ * sound/oss/uart6850.c
  *
  *
  * Copyright (C) by Hannu Savolainen 1993-1997
@@ -104,7 +104,7 @@ static void uart6850_input_loop(void)
        }
 }
 
-static irqreturn_t m6850intr(int irq, void *dev_id, struct pt_regs *dummy)
+static irqreturn_t m6850intr(int irq, void *dev_id)
 {
        if (input_avail())
                uart6850_input_loop();
@@ -146,7 +146,7 @@ static int uart6850_open(int dev, int mode,
        {
 /*               printk("Midi6850: Midi busy\n");*/
                  return -EBUSY;
-       };
+       }
 
        uart6850_cmd(UART_RESET);
        uart6850_input_loop();