lkml.org 
[lkml]   [2013]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[074/251] ALSA: usb-audio: 6fire: return correct XRUN indication
    3.6.11.9-rc1 stable review patch.
    If anyone has any objections, please let me know.

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

    From: Eldad Zack <eldad@fogrefinery.com>

    [ Upstream commit be2f93a4c4981b3646b6f98f477154411b8516cb ]

    Return SNDRV_PCM_POS_XRUN (snd_pcm_uframes_t) instead of
    SNDRV_PCM_STATE_XRUN (snd_pcm_state_t) from the pointer
    function of 6fire, as expected by snd_pcm_update_hw_ptr0().

    Caught by sparse.

    Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    sound/usb/6fire/pcm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
    index 3143d9c..7c4f311 100644
    --- a/sound/usb/6fire/pcm.c
    +++ b/sound/usb/6fire/pcm.c
    @@ -540,7 +540,7 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer(
    snd_pcm_uframes_t ret;

    if (rt->panic || !sub)
    - return SNDRV_PCM_STATE_XRUN;
    + return SNDRV_PCM_POS_XRUN;

    spin_lock_irqsave(&sub->lock, flags);
    ret = sub->dma_off;
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-09-12 08:01    [W:2.513 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site