diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-09 18:16:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-09 18:16:11 +0100 |
| commit | 8a7469064b7f601a661059e9fcd2f2deb2a8fd23 (patch) | |
| tree | e4a8fe3c1b19cff752f87716ea2093560e18d4ca /sound/pci/hda/hda_intel.c | |
| parent | ALSA: ice1724 - aureon - modify WM8770 Master & DAC volume (diff) | |
| parent | ALSA: hda/realtek: quirk for D945GCLF2 mainboard (diff) | |
| download | linux-8a7469064b7f601a661059e9fcd2f2deb2a8fd23.tar.xz linux-8a7469064b7f601a661059e9fcd2f2deb2a8fd23.zip | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index d822bfc6cad6..efcc4f7c57f2 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2450,6 +2450,11 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, } } + /* disable 64bit DMA address for Teradici */ + /* it does not work with device 6549:1200 subsys e4a2:040b */ + if (chip->driver_type == AZX_DRIVER_TERA) + gcap &= ~ICH6_GCAP_64OK; + /* allow 64bit DMA address if supported by H/W */ if ((gcap & ICH6_GCAP_64OK) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64))) pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(64)); |