From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 13 Jan 2010 07:12:31 +0000 (+0100)
Subject: ALSA: pcm_lib - fix wrong delta print for jiffies check
X-Git-Tag: v2.6.34-rc1~3^2~5^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed69c6a8eef679f2783848ed624897a937a434ac;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

ALSA: pcm_lib - fix wrong delta print for jiffies check

The previous jiffies delta was 0 in all cases. Use hw_ptr variable to
store and print original value.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 0ee7e80..5417f7d 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -394,6 +394,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
 								+ HZ/100);
 		/* move new_hw_ptr according jiffies not pos variable */
 		new_hw_ptr = old_hw_ptr;
+		hw_base = delta;
 		/* use loop to avoid checks for delta overflows */
 		/* the delta value is small or zero in most cases */
 		while (delta > 0) {
@@ -403,8 +404,6 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
 			delta--;
 		}
 		/* align hw_base to buffer_size */
-		hw_base = new_hw_ptr - (new_hw_ptr % runtime->buffer_size);
-		delta = 0;
 		hw_ptr_error(substream,
 			     "hw_ptr skipping! %s"
 			     "(pos=%ld, delta=%ld, period=%ld, "
@@ -412,9 +411,12 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
 			     in_interrupt ? "[Q] " : "",
 			     (long)pos, (long)hdelta,
 			     (long)runtime->period_size, jdelta,
-			     ((hdelta * HZ) / runtime->rate), delta,
+			     ((hdelta * HZ) / runtime->rate), hw_base,
 			     (unsigned long)old_hw_ptr,
 			     (unsigned long)new_hw_ptr);
+		/* reset values to proper state */
+		delta = 0;
+		hw_base = new_hw_ptr - (new_hw_ptr % runtime->buffer_size);
 	}
  no_jiffies_check:
 	if (delta > runtime->period_size + runtime->period_size / 2) {