lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 013/272] ALSA: timer: Fix pause event notification
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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
    @@ -592,7 +592,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;
    @@ -614,7 +614,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);

    \
     
     \ /
      Last update: 2018-05-28 14:06    [W:4.035 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site