Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ae18097 authored by Ben Hutchings's avatar Ben Hutchings Committed by Takashi Iwai
Browse files

ALSA: timer: Fix pause event notification 



Commit f65e0d29 ("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: f65e0d29 ("ALSA: timer: Call notifier in the same spinlock")
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c99f0802

sound/core/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static int snd_timer_stop1(struct snd_timer_instance *timeri, bool stop) 
	else

		timeri->flags |= SNDRV_TIMER_IFLG_PAUSED;

	snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :

			  SNDRV_TIMER_EVENT_CONTINUE);

			  SNDRV_TIMER_EVENT_PAUSE);

 unlock:

	spin_unlock_irqrestore(&timer->lock, flags);

	return result;
@@ -614,7 +614,7 @@ static int snd_timer_stop_slave(struct snd_timer_instance *timeri, bool stop) 
		list_del_init(&timeri->ack_list);

		list_del_init(&timeri->active_list);

		snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :

				  SNDRV_TIMER_EVENT_CONTINUE);

				  SNDRV_TIMER_EVENT_PAUSE);

		spin_unlock(&timeri->timer->lock);

	}

	spin_unlock_irqrestore(&slave_active_lock, flags);