From 51573e4ed787fcd30583dbe755b88338f859e8c9 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 16 Oct 2012 16:52:26 +0200
Subject: [PATCH] --- yaml --- r: 334451 b: refs/heads/master c:
 1f04661fde9deda4a2cd5845258715a22d8af197 h: refs/heads/master i:   334449:
 e586d05efe7b61a30dd20c3465e85b2d691b11ee   334447:
 c8b861c43059a83cdf0123d7ff74287b12c31f30 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_intel.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b25a2bd4f8ba..138fb5bb9885 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 128960a9ad67e2d119738f5211956e0304517551
+refs/heads/master: 1f04661fde9deda4a2cd5845258715a22d8af197
diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c
index ecf277506ad1..72b085ae7d46 100644
--- a/trunk/sound/pci/hda/hda_intel.c
+++ b/trunk/sound/pci/hda/hda_intel.c
@@ -2158,9 +2158,12 @@ static unsigned int azx_get_position(struct azx *chip,
 		if (delay < 0)
 			delay += azx_dev->bufsize;
 		if (delay >= azx_dev->period_bytes) {
-			snd_printdd("delay %d > period_bytes %d\n",
-				delay, azx_dev->period_bytes);
-			delay = 0; /* something is wrong */
+			snd_printk(KERN_WARNING SFX
+				   "Unstable LPIB (%d >= %d); "
+				   "disabling LPIB delay counting\n",
+				   delay, azx_dev->period_bytes);
+			delay = 0;
+			chip->driver_caps &= ~AZX_DCAPS_COUNT_LPIB_DELAY;
 		}
 		azx_dev->substream->runtime->delay =
 			bytes_to_frames(azx_dev->substream->runtime, delay);