1 files changed, 26 insertions, 13 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 47a5833feb7a..6bcf5af6edce 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2059,26 +2059,31 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
 {
         const struct snd_pci_quirk *q;
 
-        /* Check VIA HD Audio Controller exist */
-        if (chip->pci->vendor == PCI_VENDOR_ID_VIA &&
-            chip->pci->device == VIA_HDAC_DEVICE_ID) {
+        switch (fix) {
+        case POS_FIX_LPIB:
+        case POS_FIX_POSBUF:
+                return fix;
+        }
+
+        /* Check VIA/ATI HD Audio Controller exist */
+        switch (chip->driver_type) {
+        case AZX_DRIVER_VIA:
+        case AZX_DRIVER_ATI:
                 chip->via_dmapos_patch = 1;
                 /* Use link position directly, avoid any transfer problem. */
                 return POS_FIX_LPIB;
         }
         chip->via_dmapos_patch = 0;
 
-        if (fix == POS_FIX_AUTO) {
-                q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
-                if (q) {
-                        printk(KERN_INFO
-                                    "hda_intel: position_fix set to %d "
-                                    "for device %04x:%04x\n",
-                                    q->value, q->subvendor, q->subdevice);
-                        return q->value;
-                }
+        q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
+        if (q) {
+                printk(KERN_INFO
+                       "hda_intel: position_fix set to %d "
+                       "for device %04x:%04x\n",
+                       q->value, q->subvendor, q->subdevice);
+                return q->value;
         }
-        return fix;
+        return POS_FIX_AUTO;
 }
 
 /*
@@ -2221,9 +2226,17 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         gcap = azx_readw(chip, GCAP);
         snd_printdd("chipset global capabilities = 0x%x\n", gcap);
 
+        /* ATI chips seems buggy about 64bit DMA addresses */
+        if (chip->driver_type == AZX_DRIVER_ATI)
+                gcap &= ~0x01;
+
         /* allow 64bit DMA address if supported by H/W */
         if ((gcap & 0x01) && !pci_set_dma_mask(pci, DMA_64BIT_MASK))
                 pci_set_consistent_dma_mask(pci, DMA_64BIT_MASK);
+        else {
+                pci_set_dma_mask(pci, DMA_32BIT_MASK);
+                pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK);
+        }
 
         /* read number of streams from GCAP register instead of using
          * hardcoded value