Merge commit 'alsa/master' into for-linus

* commit 'alsa/master':
  [ALSA] intel8x0: another attempt to fix ac97_clock measure routine
  [ALSA] ac97_codec: increase timeout for analog subsections

diff --combined sound/pci/intel8x0.c
index 8042d539889227ca6ab46e23b981661cffde18b2,c4ba486785c68e58e9f4b60f5413df8309800648..173bebf9f51d0316f00a158912c2dd0eeacc9f8d
--- 1/sound/pci/intel8x0.c
--- 2/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@@ -1852,12 -1852,6 +1852,12 @@@ static struct ac97_quirk ac97_quirks[] 
                .name = "Dell Unknown", /* STAC9750/51 */
                .type = AC97_TUNE_HP_ONLY
        },
 +      {
 +              .subvendor = 0x1028,
 +              .subdevice = 0x016a,
 +              .name = "Dell Inspiron 8600",   /* STAC9750/51 */
 +              .type = AC97_TUNE_HP_ONLY
 +      },
        {
                .subvendor = 0x1028,
                .subdevice = 0x0186,
@@@ -1900,6 -1894,12 +1900,6 @@@
                .name = "HP nc6000",
                .type = AC97_TUNE_MUTE_LED
        },
 -      {
 -              .subvendor = 0x103c,
 -              .subdevice = 0x0934,
 -              .name = "HP nx8220",
 -              .type = AC97_TUNE_MUTE_LED
 -      },
        {
                .subvendor = 0x103c,
                .subdevice = 0x129d,
@@@ -2751,11 -2751,12 +2751,12 @@@ static void __devinit intel8x0_measure_
        if (pos == 0) {
                snd_printk(KERN_ERR "intel8x0: measure - unreliable DMA position..\n");
              __retry:
-               if (attempt < 2) {
+               if (attempt < 3) {
+                       msleep(300);
                        attempt++;
                        goto __again;
                }
-               return;
+               goto __end;
        }
  
        pos /= 4;
@@@ -2782,6 -2783,7 +2783,7 @@@
        else if (pos < 47500 || pos > 48500)
                /* not 48000Hz, tuning the clock.. */
                chip->ac97_bus->clock = (chip->ac97_bus->clock * 48000) / pos;
+       __end:
        printk(KERN_INFO "intel8x0: clocking to %d\n", chip->ac97_bus->clock);
        snd_ac97_update_power(chip->ac97[0], AC97_PCM_FRONT_DAC_RATE, 0);
  }