summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2013-07-23 11:15:06 +0200
committerTakashi Iwai <tiwai@suse.de>2013-07-24 10:51:37 +0200
commitfee4b700a4e9e446151eb5a03874ca8666323113 (patch)
tree928e21f066d1e7d5b8341f66ac9dbd1fa8d192f9 /sound
parentbe2f93a4c4981b3646b6f98f477154411b8516cb (diff)
downloadop-kernel-dev-fee4b700a4e9e446151eb5a03874ca8666323113.zip
op-kernel-dev-fee4b700a4e9e446151eb5a03874ca8666323113.tar.gz
ALSA: 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 <ospite@studenti.unina.it> 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/hiface/pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c
index 6430ed2..c21a3df 100644
--- a/sound/usb/hiface/pcm.c
+++ b/sound/usb/hiface/pcm.c
@@ -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;
OpenPOWER on IntegriCloud