Merge branch 'fix/hda' into for-linus

[mv-sheeva.git] / sound / core / timer.c

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 8f8b17ac074df5d8e07821c638657e55a1730fb4..73943651caed9e4376f8694ffa90835cd1d9832e 100644 (file)
--- 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;