Commit b30477d5 authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Takashi Iwai
Browse files

ALSA: timer - pass real event in snd_timer_notify1() to instance callback 



Do not use hardcoded SNDRV_TIMER_EVENT_START value.

Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent faf4eb23

include/sound/asound.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

sound/core/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -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;