ALSA: timer: Fix pause event notification
diff mbox

Message ID 20180517213439.umbmvoo2jla5zkuq@xylophone.i.decadent.org.uk
State New
Headers show

Commit Message

Ben Hutchings May 17, 2018, 9:34 p.m. UTC
Commit f65e0d299807 ("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: f65e0d299807 ("ALSA: timer: Call notifier in the same spinlock")
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Cc: stable@vger.kernel.org
---
 sound/core/timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Takashi Iwai May 18, 2018, 6:53 a.m. UTC | #1
On Thu, 17 May 2018 23:34:39 +0200,
Ben Hutchings wrote:
> 
> Commit f65e0d299807 ("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: f65e0d299807 ("ALSA: timer: Call notifier in the same spinlock")
> Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
> Cc: stable@vger.kernel.org

Thanks for catching this, applied now.


Takashi

Patch
diff mbox

diff --git a/sound/core/timer.c b/sound/core/timer.c
index dc87728c5b74..0ddcae495838 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -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);