Skip to content

Commit 3ae1809

Browse files
bwh-cttiwai
authored andcommitted
ALSA: timer: Fix pause event notification
Commit f65e0d2 ("ALSA: timer: Call notifier in the same spinlock") combined the start/continue and stop/pause functions, and in doing so changed the event code for the pause case to SNDRV_TIMER_EVENT_CONTINUE. Change it back to SNDRV_TIMER_EVENT_PAUSE. Fixes: f65e0d2 ("ALSA: timer: Call notifier in the same spinlock") Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Cc: stable@vger.kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent c99f080 commit 3ae1809

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sound/core/timer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ static int snd_timer_stop1(struct snd_timer_instance *timeri, bool stop)
592592
else
593593
timeri->flags |= SNDRV_TIMER_IFLG_PAUSED;
594594
snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :
595-
SNDRV_TIMER_EVENT_CONTINUE);
595+
SNDRV_TIMER_EVENT_PAUSE);
596596
unlock:
597597
spin_unlock_irqrestore(&timer->lock, flags);
598598
return result;
@@ -614,7 +614,7 @@ static int snd_timer_stop_slave(struct snd_timer_instance *timeri, bool stop)
614614
list_del_init(&timeri->ack_list);
615615
list_del_init(&timeri->active_list);
616616
snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :
617-
SNDRV_TIMER_EVENT_CONTINUE);
617+
SNDRV_TIMER_EVENT_PAUSE);
618618
spin_unlock(&timeri->timer->lock);
619619
}
620620
spin_unlock_irqrestore(&slave_active_lock, flags);

0 commit comments

Comments
 (0)