diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-06-08 14:02:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-06-08 14:02:06 +0200 |
| commit | 0280e07bbd6efa691daa7356b6bb05514cdcab68 (patch) | |
| tree | 1ef76c078b566050dbc865ee9afeb0d526329893 /sound/core/timer.c | |
| parent | 5fe8f0a0a83ab78c75010e161fa27ae66e36cd64 (diff) | |
| parent | 600dd2a7e8b62170d177381cc1303861f48f9780 (diff) | |
| download | linux-0280e07bbd6efa691daa7356b6bb05514cdcab68.tar.bz2 | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 6898b1ac0d7f..92b7008fcdb8 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -520,9 +520,10 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) return; if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE) return; + event += 10; /* convert to SNDRV_TIMER_EVENT_MXXX */ list_for_each_entry(ts, &ti->slave_active_head, active_list) if (ts->ccallback) - ts->ccallback(ts, event + 100, &tstamp, resolution); + ts->ccallback(ts, event, &tstamp, resolution); } /* start/continue a master timer */ |