diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:41:57 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:41:57 -0500 |
| commit | d28c145debb1bd53cde63ac8bccc192e3e00067e (patch) | |
| tree | 87fb1d66cab7689aa662ebd0337b39ff1bf6f433 /sound/core/timer.c | |
| parent | 2e733b3f84fa9c2ae60513c5f7b56d599ed2ae02 (diff) | |
| parent | ec0ffe2ee0e0fb9da4409d86bfd72636450f32df (diff) | |
Merge branch 'sh/driver-core' into sh/clkfwk
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) | |||
| 393 | event == SNDRV_TIMER_EVENT_CONTINUE) | 393 | event == SNDRV_TIMER_EVENT_CONTINUE) |
| 394 | resolution = snd_timer_resolution(ti); | 394 | resolution = snd_timer_resolution(ti); |
| 395 | if (ti->ccallback) | 395 | if (ti->ccallback) |
| 396 | ti->ccallback(ti, SNDRV_TIMER_EVENT_START, &tstamp, resolution); | 396 | ti->ccallback(ti, event, &tstamp, resolution); |
| 397 | if (ti->flags & SNDRV_TIMER_IFLG_SLAVE) | 397 | if (ti->flags & SNDRV_TIMER_IFLG_SLAVE) |
| 398 | return; | 398 | return; |
| 399 | timer = ti->timer; | 399 | timer = ti->timer; |