Changeset 612 for GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/sonicvibes.c

Timestamp:

May 16, 2020, 10:05:07 AM (5 years ago)

Author:

Paul Smedley

Message:

Commit 3..102 changes from trunk

File:

• GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/sonicvibes.c (modified) (4 diffs)

GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/sonicvibes.c

@@ -29 +29 @@
 #include <linux/slab.h>
 #include <linux/gameport.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/dma-mapping.h>
 
@@ -1295 +1295 @@
 
         if (request_irq(pci->irq, snd_sonicvibes_interrupt, IRQF_SHARED,
-                        "S3 SonicVibes", sonic)) {
+                        KBUILD_MODNAME, sonic)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_sonicvibes_free(sonic);
@@ -1494 +1494 @@
         }
         if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES,
-                                       sonic->midi_port, MPU401_INFO_INTEGRATED,
-                                       sonic->irq, 0,
-                                       &midi_uart)) < 0) {
+                                       sonic->midi_port,
+                                       MPU401_INFO_INTEGRATED |
+                                       MPU401_INFO_IRQ_HOOK,
+                                       -1, &midi_uart)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -1531 +1532 @@
 
 static struct pci_driver driver = {
-        .name = "S3 SonicVibes",
+        .name = KBUILD_MODNAME,
         .id_table = snd_sonic_ids,
         .probe = snd_sonic_probe,