Commit be2f93a4 authored Jul 19, 2013 by Eldad Zack Committed by Takashi Iwai Jul 21, 2013

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>

parent f3e351ee

sound/usb/6fire/pcm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -543,7 +543,7 @@ static snd_pcm_uframes_t usb6fire_pcm_pointer(
	snd_pcm_uframes_t ret;		snd_pcm_uframes_t ret;

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

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