diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-03-03 11:05:55 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-03 22:39:45 +0100 |
| commit | b30477d5e2961bfd90ad4146c517871ca8a6bebc (patch) | |
| tree | d47155654523e0bd5d49280918d19ba3cd9f9cc0 | |
| parent | faf4eb23d5fcb9a4728766a1e7bce9c6f2b43bd8 (diff) | |
| download | linux-b30477d5e2961bfd90ad4146c517871ca8a6bebc.tar.bz2 | |
ALSA: timer - pass real event in snd_timer_notify1() to instance callback
Do not use hardcoded SNDRV_TIMER_EVENT_START value.
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | include/sound/asound.h | 2 | ||||
| -rw-r--r-- | sound/core/timer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h index 1f57bb92eb5a..098595500632 100644 --- a/include/sound/asound.h +++ b/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/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; |