diff --git a/[refs] b/[refs] index d6f7dd424eae..6a44b59144aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17f48ec3f15ddb8080b151304ee887c68f7e4650 +refs/heads/master: 6ed5eff025b72cb84a884d4be05f854f13b1542f diff --git a/trunk/sound/core/timer.c b/trunk/sound/core/timer.c index 86357007259d..0f6e6727ff7c 100644 --- a/trunk/sound/core/timer.c +++ b/trunk/sound/core/timer.c @@ -971,7 +971,7 @@ static void snd_timer_s_function(unsigned long data) struct snd_timer_system_private *priv = timer->private_data; unsigned long jiff = jiffies; if (time_after(jiff, priv->last_expires)) - priv->correction = (long)jiff - (long)priv->last_expires; + priv->correction += (long)jiff - (long)priv->last_expires; snd_timer_interrupt(timer, (long)jiff - (long)priv->last_jiffies); }