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

Timestamp:

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

Author:

Brendan Oakley

Message:

Merged to ALSA 1.0.2

File:

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

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

@@ -2706 +2706 @@
 
     /* check, if we can restrict PCI DMA transfers to 28 bits */
-    if (!pci_dma_supported(pci, 0x0fffffff)) {
+        if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
+            pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
         snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
         return -ENXIO;
     }
-    pci_set_consistent_dma_mask(pci, 0x0fffffff);
 
     chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
@@ -2829 +2829 @@
     snd_m3_enable_ints(chip);
     snd_m3_assp_continue(chip);
+
+        snd_card_set_dev(card, &pci->dev);
 
     *chip_ret = chip;