Skip to contentSkip to conversation

ALSA: seq: Fix time account regression

PATCH New Takashi Iwai 1 participant 1 message Oct 25, 2016 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: seq: Fix time account regression

The recent rewrite of the sequencer time accounting using timespec64 in the commit [3915bf294652: ALSA: seq_timer: use monotonic times internally] introduced a bad regression. Namely, the time reported back doesn't increase but goes back and forth.

The culprit was obvious: the delta is stored to the result (cur_time = delta), instead of adding the delta (cur_time += delta)!

Let's fix it.

Fixes 3915bf294652 ('ALSA: seq_timer: use monotonic times internally')

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=177571

---
 sound/core/seq/seq_timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/seq/seq_timer.c +2 -2
index dcc102813aef..37d9cfbc29f9 100644
@@ -448,8 +448,8 @@ snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr)
 
 		ktime_get_ts64(&tm);
 		tm = timespec64_sub(tm, tmr->last_update);
-		cur_time.tv_nsec = tm.tv_nsec;
-		cur_time.tv_sec = tm.tv_sec;
+		cur_time.tv_nsec += tm.tv_nsec;
+		cur_time.tv_sec += tm.tv_sec;
 		snd_seq_sanity_real_time(&cur_time);
 	}
 	spin_unlock_irqrestore(&tmr->lock, flags);
Signature · 1 line
2.10.1