hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: wm_adsp: Use new snd_compr_stop_error to signal stream failure 

If we encounter a fatal error on the compressed stream call the new
snd_compr_stop_error to shutdown the stream and allow the core to
inform user-space that the stream is no longer valid.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Reviewed-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2016-06-13 14:17:11 +01:00 committed by Mark Brown
parent 7a75c0d110
commit 8d280664d2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/codecs/wm_adsp.c
View File

@ -3043,6 +3043,7 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream,
} }
if (compr->buf->error) { if (compr->buf->error) {
snd_compr_stop_error(stream, SNDRV_PCM_STATE_XRUN);
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
@ -3060,8 +3061,12 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream,
*/ */
if (buf->avail < wm_adsp_compr_frag_words(compr)) { if (buf->avail < wm_adsp_compr_frag_words(compr)) {
ret = wm_adsp_buffer_get_error(buf); ret = wm_adsp_buffer_get_error(buf);
if (ret < 0) if (ret < 0) {
if (compr->buf->error)
snd_compr_stop_error(stream,
SNDRV_PCM_STATE_XRUN);
goto out; goto out;
}
ret = wm_adsp_buffer_reenable_irq(buf); ret = wm_adsp_buffer_reenable_irq(buf);
if (ret < 0) { if (ret < 0) {
@ -3159,8 +3164,10 @@ static int wm_adsp_compr_read(struct wm_adsp_compr *compr,
if (!compr->buf) if (!compr->buf)
return -ENXIO; return -ENXIO;
if (compr->buf->error) if (compr->buf->error) {
snd_compr_stop_error(compr->stream, SNDRV_PCM_STATE_XRUN);
return -EIO; return -EIO;
}
count /= WM_ADSP_DATA_WORD_SIZE; count /= WM_ADSP_DATA_WORD_SIZE;