| From 3ae180972564846e6d794e3615e1ab0a1e6c4ef9 Mon Sep 17 00:00:00 2001 |
| From: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| Date: Thu, 17 May 2018 22:34:39 +0100 |
| Subject: ALSA: timer: Fix pause event notification |
| |
| From: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| |
| commit 3ae180972564846e6d794e3615e1ab0a1e6c4ef9 upstream. |
| |
| 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 |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/core/timer.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/sound/core/timer.c |
| +++ b/sound/core/timer.c |
| @@ -547,7 +547,7 @@ static int snd_timer_stop1(struct snd_ti |
| 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; |
| @@ -569,7 +569,7 @@ static int snd_timer_stop_slave(struct s |
| 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); |
