Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 24 insertions, 10 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 6abaa6bbb3d6..a7cf34965225 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1470,6 +1470,17 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
                 return err;
         }
         snd_pcm_limit_hw_rates(runtime);
+        /* sanity check */
+        if (snd_BUG_ON(!runtime->hw.channels_min) ||
+            snd_BUG_ON(!runtime->hw.channels_max) ||
+            snd_BUG_ON(!runtime->hw.formats) ||
+            snd_BUG_ON(!runtime->hw.rates)) {
+                azx_release_device(azx_dev);
+                hinfo->ops.close(hinfo, apcm->codec, substream);
+                snd_hda_power_down(apcm->codec);
+                mutex_unlock(&chip->open_mutex);
+                return -EINVAL;
+        }
         spin_lock_irqsave(&chip->reg_lock, flags);
         azx_dev->substream = substream;
         azx_dev->running = 0;
@@ -1478,13 +1489,6 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
         runtime->private_data = azx_dev;
         snd_pcm_set_sync(substream);
         mutex_unlock(&chip->open_mutex);
-
-        if (snd_BUG_ON(!runtime->hw.channels_min || !runtime->hw.channels_max))
-                return -EINVAL;
-        if (snd_BUG_ON(!runtime->hw.formats))
-                return -EINVAL;
-        if (snd_BUG_ON(!runtime->hw.rates))
-                return -EINVAL;
         return 0;
 }
 
@@ -2344,9 +2348,19 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         gcap = azx_readw(chip, GCAP);
         snd_printdd(SFX "chipset global capabilities = 0x%x\n", gcap);
 
-        /* ATI chips seems buggy about 64bit DMA addresses */
-        if (chip->driver_type == AZX_DRIVER_ATI)
-                gcap &= ~ICH6_GCAP_64OK;
+        /* disable SB600 64bit support for safety */
+        if ((chip->driver_type == AZX_DRIVER_ATI) ||
+            (chip->driver_type == AZX_DRIVER_ATIHDMI)) {
+                struct pci_dev *p_smbus;
+                p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,
+                                         PCI_DEVICE_ID_ATI_SBX00_SMBUS,
+                                         NULL);
+                if (p_smbus) {
+                        if (p_smbus->revision < 0x30)
+                                gcap &= ~ICH6_GCAP_64OK;
+                        pci_dev_put(p_smbus);
+                }
+        }
 
         /* allow 64bit DMA address if supported by H/W */
         if ((gcap & ICH6_GCAP_64OK) && !pci_set_dma_mask(pci, DMA_BIT_MASK(64)))