1 files changed, 30 insertions, 3 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 1a7e82104bb9..b9a8e238b0a8 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -199,7 +199,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
 
 /* STATESTS int mask: SD2,SD1,SD0 */
 #define STATESTS_INT_MASK       0x07
-#define AZX_MAX_CODECS          4
+#define AZX_MAX_CODECS          3
 
 /* SD_CTL bits */
 #define SD_CTL_STREAM_RESET     0x01    /* stream reset bit */
@@ -1285,7 +1285,7 @@ static int __devinit create_codec_pcm(struct azx *chip, struct hda_codec *codec,
                 snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &azx_pcm_ops);
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
                                               snd_dma_pci_data(chip->pci),
-                                              1024 * 64, 1024 * 128);
+                                              1024 * 64, 1024 * 1024);
         chip->pcm[pcm_dev] = pcm;
         if (chip->pcm_devs < pcm_dev + 1)
                 chip->pcm_devs = pcm_dev + 1;
@@ -1391,6 +1391,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
                 return -1;
         }
         chip->irq = chip->pci->irq;
+        pci_intx(chip->pci, !chip->msi);
         return 0;
 }
 
@@ -1502,6 +1503,31 @@ static int azx_dev_free(struct snd_device *device)
 }
 
 /*
+ * white/black-listing for position_fix
+ */
+static const struct snd_pci_quirk position_fix_list[] __devinitdata = {
+        SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_NONE),
+        {}
+};
+
+static int __devinit check_position_fix(struct azx *chip, int fix)
+{
+        const struct snd_pci_quirk *q;
+
+        if (fix == POS_FIX_AUTO) {
+                q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
+                if (q) {
+                        snd_printdd(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;
+}
+
+/*
  * constructor
  */
 static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
@@ -1535,7 +1561,8 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
         chip->driver_type = driver_type;
         chip->msi = enable_msi;
 
-        chip->position_fix = position_fix;
+        chip->position_fix = check_position_fix(chip, position_fix);
+
         chip->single_cmd = single_cmd;
 
 #if BITS_PER_LONG != 64