---

yaml --- r: 187023 b: refs/heads/master c: b30477d h: refs/heads/master i: 187021: 6263300 187019: b18955b 187015: 8de0a11 187007: 1e27aab v: v3
git-mirror · Mar 3, 2010 · 20ffd96 · 20ffd96
1 parent e8dba4f
commit 20ffd96
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faf4eb23d5fcb9a4728766a1e7bce9c6f2b43bd8
+refs/heads/master: b30477d5e2961bfd90ad4146c517871ca8a6bebc
diff --git a/trunk/include/sound/asound.h b/trunk/include/sound/asound.h
@@ -544,7 +544,7 @@ struct snd_rawmidi_status {
  *  Timer section - /dev/snd/timer
  */
 
-#define SNDRV_TIMER_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 5)
+#define SNDRV_TIMER_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 6)
 
 enum {
 	SNDRV_TIMER_CLASS_NONE = -1,

diff --git a/trunk/sound/core/timer.c b/trunk/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;