Skip to contentSkip to conversation

ALSA: usb-audio: hiface: return correct XRUN indication

PATCH Applied Eldad Zack 2 participants 2 messages Jul 23, 2013 – Jul 24, 2013 Sound

lore
Share & tools
lore

Eldad Zack

author
#0 lore raw

PATCH v2 1/1 ALSA: usb-audio: hiface: 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 hiface, as expected by snd_pcm_update_hw_ptr0().

Caught by sparse.

Cc Antonio Ospite <[email protected]>

---
* Corrected commit message

 sound/usb/hiface/pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/hiface/pcm.c +1 -1
index 6430ed2..c21a3df 100644
@@ -503,7 +503,7 @@ static snd_pcm_uframes_t hiface_pcm_pointer(struct snd_pcm_substream *alsa_sub)
 	snd_pcm_uframes_t dma_offset;
 
 	if (rt->panic || !sub)
-		return SNDRV_PCM_STATE_XRUN;
+		return SNDRV_PCM_POS_XRUN;
 
 	spin_lock_irqsave(&sub->lock, flags);
 	dma_offset = sub->dma_off;
Signature · 1 line
1.8.1.5
Applied
#1 lore raw

At Tue, 23 Jul 2013 11:15:06 +0200,

Quoted 9 lines · Eldad Zack

Return SNDRV_PCM_POS_XRUN (snd_pcm_uframes_t) instead of SNDRV_PCM_STATE_XRUN (snd_pcm_state_t) from the pointer function of hiface, as expected by snd_pcm_update_hw_ptr0().

Caught by sparse.

Cc Antonio Ospite <[email protected]>

Thanks, applied.

Takashi

Quoted 22 lines

---
* Corrected commit message

 sound/usb/hiface/pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/hiface/pcm.c +1 -1
index 6430ed2..c21a3df 100644
@@ -503,7 +503,7 @@ static snd_pcm_uframes_t hiface_pcm_pointer(struct snd_pcm_substream *alsa_sub)
 	snd_pcm_uframes_t dma_offset;
 
 	if (rt->panic || !sub)
-		return SNDRV_PCM_STATE_XRUN;
+		return SNDRV_PCM_POS_XRUN;
 
 	spin_lock_irqsave(&sub->lock, flags);
 	dma_offset = sub->dma_off;
Signature · 1 line
1.8.1.5