Changeset 262 for GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c

Timestamp:

Oct 18, 2007, 6:38:12 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.6

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c (modified) (2 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/sonicvibes.c

@@ -265 +265 @@
 };
 
-static struct pci_device_id snd_sonic_ids[] __devinitdata = {
+static struct pci_device_id snd_sonic_ids[] = {
         { 0x5333, 0xca00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
         { 0, }
@@ -1269 +1269 @@
         sonic->sb_port = pci_resource_start(pci, 0);
         if ((sonic->res_sb_port = request_region(sonic->sb_port, 0x10, "S3 SonicVibes SB")) == NULL) {
+                snd_printk("unable to grab SB port at 0x%lx-0x%lx\n", sonic->sb_port, sonic->sb_port + 0x10 - 1);
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab SB port at 0x%lx-0x%lx\n", sonic->sb_port, sonic->sb_port + 0x10 - 1);
                 return -EBUSY;
         }
         sonic->enh_port = pci_resource_start(pci, 1);
         if ((sonic->res_enh_port = request_region(sonic->enh_port, 0x10, "S3 SonicVibes Enhanced")) == NULL) {
+                snd_printk("unable to grab PCM port at 0x%lx-0x%lx\n", sonic->enh_port, sonic->enh_port + 0x10 - 1);
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab PCM port at 0x%lx-0x%lx\n", sonic->enh_port, sonic->enh_port + 0x10 - 1);
                 return -EBUSY;
         }
         sonic->synth_port = pci_resource_start(pci, 2);
         if ((sonic->res_synth_port = request_region(sonic->synth_port, 4, "S3 SonicVibes Synth")) == NULL) {
+                snd_printk("unable to grab synth port at 0x%lx-0x%lx\n", sonic->synth_port, sonic->synth_port + 4 - 1);
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab synth port at 0x%lx-0x%lx\n", sonic->synth_port, sonic->synth_port + 4 - 1);
                 return -EBUSY;
         }
         sonic->midi_port = pci_resource_start(pci, 3);
         if ((sonic->res_midi_port = request_region(sonic->midi_port, 4, "S3 SonicVibes Midi")) == NULL) {
+                snd_printk("unable to grab MIDI port at 0x%lx-0x%lx\n", sonic->midi_port, sonic->midi_port + 4 - 1);
                 snd_sonicvibes_free(sonic);
-                snd_printk("unable to grab MIDI port at 0x%lx-0x%lx\n", sonic->midi_port, sonic->midi_port + 4 - 1);
                 return -EBUSY;
         }
         sonic->game_port = pci_resource_start(pci, 4);
         if (request_irq(pci->irq, snd_sonicvibes_interrupt, SA_INTERRUPT|SA_SHIRQ, "S3 SonicVibes", (void *)sonic)) {
-                snd_magic_kfree(sonic);
                 snd_printk("unable to grab IRQ %d\n", pci->irq);
+                snd_sonicvibes_free(sonic);
                 return -EBUSY;
         }