diff options
author | JongHo Kim <furmuwon@gmail.com> | 2013-12-17 23:02:24 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-09 12:24:20 -0800 |
commit | 79acc77a3f65760e9403d431f4a0b100dccdfb6e (patch) | |
tree | 9c8a64b123b0b06ec4f7cce040f98654726ae8b7 /sound/core | |
parent | 6dd598aca39d1e62fd26403322b762adfd3b2440 (diff) | |
download | linux-3.10-79acc77a3f65760e9403d431f4a0b100dccdfb6e.tar.gz linux-3.10-79acc77a3f65760e9403d431f4a0b100dccdfb6e.tar.bz2 linux-3.10-79acc77a3f65760e9403d431f4a0b100dccdfb6e.zip |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/pcm_lib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 41b3dfe6869..3284940a4af 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1936,6 +1936,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", |