diff options
author | Takashi Iwai | 2010-03-08 09:35:50 +0100 |
---|---|---|
committer | Takashi Iwai | 2010-03-08 09:35:50 +0100 |
commit | a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (patch) | |
tree | 5d9ecc2dd903ed506c58a31f1076b2df500a6fe0 /sound/core/timer.c | |
parent | Merge branch 'topic/asoc' into for-linus (diff) | |
parent | ALSA: usb/audio.h: Fix field order (diff) | |
download | kernel-qcow2-linux-a3087ae970e5c8984fab2306b1f4dbe5ef132ff7.tar.gz kernel-qcow2-linux-a3087ae970e5c8984fab2306b1f4dbe5ef132ff7.tar.xz kernel-qcow2-linux-a3087ae970e5c8984fab2306b1f4dbe5ef132ff7.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/core/timer.c')
-rw-r--r-- | sound/core/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 8f8b17ac074d..73943651caed 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -393,7 +393,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) event == SNDRV_TIMER_EVENT_CONTINUE) resolution = snd_timer_resolution(ti); if (ti->ccallback) - ti->ccallback(ti, SNDRV_TIMER_EVENT_START, &tstamp, resolution); + ti->ccallback(ti, event, &tstamp, resolution); if (ti->flags & SNDRV_TIMER_IFLG_SLAVE) return; timer = ti->timer; |