| From be2f93a4c4981b3646b6f98f477154411b8516cb Mon Sep 17 00:00:00 2001 |
| From: Eldad Zack <eldad@fogrefinery.com> |
| Date: Fri, 19 Jul 2013 18:26:53 +0200 |
| Subject: ALSA: usb-audio: 6fire: return correct XRUN indication |
| |
| From: Eldad Zack <eldad@fogrefinery.com> |
| |
| 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> |
| |
| --- |
| sound/usb/6fire/pcm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/sound/usb/6fire/pcm.c |
| +++ b/sound/usb/6fire/pcm.c |
| @@ -541,7 +541,7 @@ static snd_pcm_uframes_t usb6fire_pcm_po |
| 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; |
