---

yaml --- r: 233190 b: refs/heads/master c: b1d4f7f h: refs/heads/master v: v3
git-mirror · Feb 10, 2011 · 62b5cb2 · 62b5cb2
1 parent fd0f730
commit 62b5cb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6c47a85b8e7e4a8c47394607c5e5c43224b0892
+refs/heads/master: b1d4f7f4bdcf9915c41ff8cfc4425c84dabb1fde
diff --git a/trunk/sound/core/hrtimer.c b/trunk/sound/core/hrtimer.c
@@ -45,12 +45,13 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
 {
 	struct snd_hrtimer *stime = container_of(hrt, struct snd_hrtimer, hrt);
 	struct snd_timer *t = stime->timer;
+	unsigned long oruns;
 
 	if (!atomic_read(&stime->running))
 		return HRTIMER_NORESTART;
 
-	hrtimer_forward_now(hrt, ns_to_ktime(t->sticks * resolution));
-	snd_timer_interrupt(stime->timer, t->sticks);
+	oruns = hrtimer_forward_now(hrt, ns_to_ktime(t->sticks * resolution));
+	snd_timer_interrupt(stime->timer, t->sticks * oruns);
 
 	if (!atomic_read(&stime->running))
 		return HRTIMER_NORESTART;