From 6b9d89882e7643d9ec6eea2dc68f4c04b722df27 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 21 Apr 2009 15:30:31 +0200
Subject: [PATCH] --- yaml --- r: 143995 b: refs/heads/master c:
 30fd9940eee910d847f48bd8740b2d0eaa8d2cfc h: refs/heads/master i:   143993:
 d5f603570492fbf616d25298ef7c6a9d08157154   143991:
 5d08db9f2ae6da6f0205c74a28bf3ef0470a7e43 v: v3

---
 [refs]                     | 2 +-
 trunk/sound/pci/intel8x0.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0f818448d416..a65947a39b11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e10f9d87c9ac9fdfadb6305dbbc9052e49a02fdd
+refs/heads/master: 30fd9940eee910d847f48bd8740b2d0eaa8d2cfc
diff --git a/trunk/sound/pci/intel8x0.c b/trunk/sound/pci/intel8x0.c
index 5dced5b79387..c4ba486785c6 100644
--- a/trunk/sound/pci/intel8x0.c
+++ b/trunk/sound/pci/intel8x0.c
@@ -2751,11 +2751,12 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)
 	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 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)
 	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);
 }