aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorJongHo Kim <furmuwon@gmail.com>2013-12-17 23:02:24 +0900
committerBen Hutchings <ben@decadent.org.uk>2014-02-15 19:20:14 +0000
commit2fd7b46281e382ea7e35ac120efa73d9fa912ee7 (patch)
tree9942ef2d11a36f5dfa83512a046ab3f7fa4bd0dd /sound/core
parent069623122342d660364e011d1d3e2dfaad18b75d (diff)
downloadkernel_samsung_smdk4412-2fd7b46281e382ea7e35ac120efa73d9fa912ee7.zip
kernel_samsung_smdk4412-2fd7b46281e382ea7e35ac120efa73d9fa912ee7.tar.gz
kernel_samsung_smdk4412-2fd7b46281e382ea7e35ac120efa73d9fa912ee7.tar.bz2
ALSA: Add SNDRV_PCM_STATE_PAUSED case in wait_for_avail function
commit ed697e1aaf7237b1a62af39f64463b05c262808d upstream. When the process is sleeping at the SNDRV_PCM_STATE_PAUSED state from the wait_for_avail function, the sleep process will be woken by timeout(10 seconds). Even if the sleep process wake up by timeout, by this patch, the process will continue with sleep and wait for the other state. Signed-off-by: JongHo Kim <furmuwon@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/pcm_lib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 3420bd3..cf0d46e 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -1846,6 +1846,8 @@ static int wait_for_avail(struct snd_pcm_substream *substream,
case SNDRV_PCM_STATE_DISCONNECTED:
err = -EBADFD;
goto _endloop;
+ case SNDRV_PCM_STATE_PAUSED:
+ continue;
}
if (!tout) {
snd_printd("%s write error (DMA or IRQ trouble?)\n",