Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 3 insertions, 1 deletions

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index a82e3756a72..64449cb8f87 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -375,6 +375,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
         }
 
         if (runtime->no_period_wakeup) {
+                snd_pcm_sframes_t xrun_threshold;
                 /*
                  * Without regular period interrupts, we have to check
                  * the elapsed time to detect xruns.
@@ -383,7 +384,8 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
                 if (jdelta < runtime->hw_ptr_buffer_jiffies / 2)
                         goto no_delta_check;
                 hdelta = jdelta - delta * HZ / runtime->rate;
-                while (hdelta > runtime->hw_ptr_buffer_jiffies / 2 + 1) {
+                xrun_threshold = runtime->hw_ptr_buffer_jiffies / 2 + 1;
+                while (hdelta > xrun_threshold) {
                         delta += runtime->buffer_size;
                         hw_base += runtime->buffer_size;
                         if (hw_base >= runtime->boundary)