summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2013-07-19 18:26:53 +0200
committerBen Hutchings <ben@decadent.org.uk>2013-08-02 22:15:01 +0200
commit4167cb56f8a6ca68589a07a214461fe52b78ba20 (patch)
tree7bf99a2f22db5b5f27049cfa4ca8bca679571a60 /sound/usb
parent8333b0a8375d9d2f2fa2141c418a895fcf1a8c04 (diff)
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound/usb')
-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 70ed16016488..888a7c75d412 100644
--- a/sound/usb/6fire/pcm.c
+++ b/sound/usb/6fire/pcm.c
@@ -541,7 +541,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;