diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-21 11:59:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:03:54 +0200 |
| commit | 4f7c39dc557cabdbc932ae83432cc225c480133c (patch) | |
| tree | 4441b85e8a0c4301eff132131b82bb6ff615a3c3 /sound | |
| parent | d4c6983859a82422640c727d2426b435dfff56f4 (diff) | |
| download | linux-3.10-4f7c39dc557cabdbc932ae83432cc225c480133c.tar.gz linux-3.10-4f7c39dc557cabdbc932ae83432cc225c480133c.tar.bz2 linux-3.10-4f7c39dc557cabdbc932ae83432cc225c480133c.zip | |
ALSA: pcm - Add proper state checks to snd_pcm_drain()
The handling for some PCM states is missing for snd_pcm_drain().
At least, XRUN streams should be simply dropped to SETUP, and a few
initial invalid states should be rejected.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm_native.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 3fe99e644eb..53b5ada8f7c 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1360,7 +1360,14 @@ static int snd_pcm_prepare(struct snd_pcm_substream *substream, static int snd_pcm_pre_drain_init(struct snd_pcm_substream *substream, int state) { - substream->runtime->trigger_master = substream; + struct snd_pcm_runtime *runtime = substream->runtime; + switch (runtime->status->state) { + case SNDRV_PCM_STATE_OPEN: + case SNDRV_PCM_STATE_DISCONNECTED: + case SNDRV_PCM_STATE_SUSPENDED: + return -EBADFD; + } + runtime->trigger_master = substream; return 0; } @@ -1379,6 +1386,9 @@ static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream, int state) case SNDRV_PCM_STATE_RUNNING: runtime->status->state = SNDRV_PCM_STATE_DRAINING; break; + case SNDRV_PCM_STATE_XRUN: + runtime->status->state = SNDRV_PCM_STATE_SETUP; + break; default: break; } |