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

Timestamp:

Feb 16, 2008, 7:40:20 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 1.0.2

File:

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

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

@@ -1254 +1254 @@
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (!pci_dma_supported(pci, 0x00ffffff)) {
+        if (pci_set_dma_mask(pci, 0x00ffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) {
                 snd_printk("architecture does not support 24bit PCI busmaster DMA\n");
                 return -ENXIO;
         }
-        pci_set_consistent_dma_mask(pci, 0x00ffffff);
 
         sonic = snd_magic_kcalloc(sonicvibes_t, 0, GFP_KERNEL);
@@ -1389 +1389 @@
         }
 
+        snd_card_set_dev(card, &pci->dev);
+
         *rsonic = sonic;
         return 0;
@@ -1472 +1474 @@
                 return err;
         }
-        if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_sonicvibes_mixer(sonic)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES,
-                                       sonic->midi_port, 1,
-                                       sonic->irq, 0,
-                                       &midi_uart)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        snd_sonicvibes_midi(sonic, midi_uart);
-        if ((err = snd_opl3_create(card, sonic->synth_port,
-                                   sonic->synth_port + 2,
-                                   OPL3_HW_OPL3_SV, 1, &opl3)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
-        sonic->gameport.io = sonic->game_port;
-        gameport_register_port(&sonic->gameport);
-#endif
+
         strcpy(card->driver, "SonicVibes");
         strcpy(card->shortname, "S3 SonicVibes");
@@ -1509 +1482 @@
                 pci_resource_start(pci, 1),
                 sonic->irq);
+
+        if ((err = snd_sonicvibes_pcm(sonic, 0, NULL)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        if ((err = snd_sonicvibes_mixer(sonic)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SONICVIBES,
+                                       sonic->midi_port, 1,
+                                       sonic->irq, 0,
+                                       &midi_uart)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        snd_sonicvibes_midi(sonic, midi_uart);
+        if ((err = snd_opl3_create(card, sonic->synth_port,
+                                   sonic->synth_port + 2,
+                                   OPL3_HW_OPL3_SV, 1, &opl3)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+        sonic->gameport.io = sonic->game_port;
+        gameport_register_port(&sonic->gameport);
+#endif
 
         if ((err = snd_card_register(card)) < 0) {