At Fri, 26 Jul 2013 13:37:35 -0700, <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > The patch below does not apply to the 3.10-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <stable@xxxxxxxxxxxxxxx>. This was tagged mistakenly, as I thought that the driver was included in 3.10. Sorry for inconvenience. Takashi > > thanks, > > greg k-h > > ------------------ original commit in Linus's tree ------------------ > > >From fee4b700a4e9e446151eb5a03874ca8666323113 Mon Sep 17 00:00:00 2001 > From: Eldad Zack <eldad@xxxxxxxxxxxxxxx> > Date: Tue, 23 Jul 2013 11:15:06 +0200 > Subject: [PATCH] ALSA: hiface: return correct XRUN indication > > Return SNDRV_PCM_POS_XRUN (snd_pcm_uframes_t) instead of > SNDRV_PCM_STATE_XRUN (snd_pcm_state_t) from the pointer > function of hiface, as expected by snd_pcm_update_hw_ptr0(). > > Caught by sparse. > > Cc: Antonio Ospite <ospite@xxxxxxxxxxxxxxxxx> > Signed-off-by: Eldad Zack <eldad@xxxxxxxxxxxxxxx> > Cc: <stable@xxxxxxxxxxxxxxx> > Signed-off-by: Takashi Iwai <tiwai@xxxxxxx> > > diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c > index 6430ed2a..c21a3df9 100644 > --- a/sound/usb/hiface/pcm.c > +++ b/sound/usb/hiface/pcm.c > @@ -503,7 +503,7 @@ static snd_pcm_uframes_t hiface_pcm_pointer(struct snd_pcm_substream *alsa_sub) > snd_pcm_uframes_t dma_offset; > > if (rt->panic || !sub) > - return SNDRV_PCM_STATE_XRUN; > + return SNDRV_PCM_POS_XRUN; > > spin_lock_irqsave(&sub->lock, flags); > dma_offset = sub->dma_off; > -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html