aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2013-07-19 18:26:53 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-28 16:26:48 -0700
commitacaeda3564698c617c88db226a1773547c97d29e (patch)
tree3595a8551558204372f5c79b8eb508f3d3d0c8d7
parent39367f485b87492a5e51af8496a684eafa4aec86 (diff)
downloadlinux-linaro-stable-acaeda3564698c617c88db226a1773547c97d29e.tar.gz
ALSA: usb-audio: 6fire: return correct XRUN indication
commit be2f93a4c4981b3646b6f98f477154411b8516cb upstream. 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> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/usb/6fire/pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
index c97d05f0e966..4da9ca9c81bf 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;