summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2013-07-19 18:26:53 +0200
committerTakashi Iwai <tiwai@suse.de>2013-07-21 11:55:22 +0200
commitbe2f93a4c4981b3646b6f98f477154411b8516cb (patch)
tree7c047125d2bccb954cd143f2e8633b5e0c0571f6 /sound
parentf3e351eef3a7fd1e36a3e18d4f2f069b00deb23c (diff)
downloadlinux-be2f93a4c4981b3646b6f98f477154411b8516cb.tar.gz
linux-be2f93a4c4981b3646b6f98f477154411b8516cb.tar.bz2
linux-be2f93a4c4981b3646b6f98f477154411b8516cb.zip
ALSA: usb-audio: 6fire: 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 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>
Diffstat (limited to 'sound')
-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 2aa4e13063a8..3d2551cc10f2 100644
--- a/sound/usb/6fire/pcm.c
+++ b/sound/usb/6fire/pcm.c
@@ -543,7 +543,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;