Changeset 598 for GPL/trunk/alsa-kernel/drivers/mtpav.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/drivers/mtpav.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/drivers/mtpav.c

@@ -53 +53 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
-#include <linux/io.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
@@ -63 +61 @@
 #include <sound/rawmidi.h>
 #include <linux/delay.h>
+
+#include <asm/io.h>
 
 /*
@@ -591 +591 @@
         }
         mcard->port = port;
-        if (request_irq(irq, snd_mtpav_irqh, 0, "MOTU MTPAV", mcard)) {
+        if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
                 snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq);
                 return -EBUSY;