diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-24 16:08:31 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-14 08:43:52 +0300 |
| commit | 4b95ff781e30c50298257d22a2c3743b2e5739be (patch) | |
| tree | 348558ed57d9e59d581bb9af5b27eb98c38dd3b5 /sound/core | |
| parent | 68b4acd322494444803a3f49884ae889c8ec6689 (diff) | |
| download | linux-4b95ff781e30c50298257d22a2c3743b2e5739be.tar.xz | |
ALSA: pcm: Allow dropping stream directly after resume
So far, the PCM core refuses DROP ioctl when the stream in the
suspended state. This was basically to avoid the invalid state change
*during* the suspend. But since we protect the power change globally
in the common PCM ioctl caller side, it's guaranteed that
snd_pcm_drop() is called at the right power state. So we can assume
that the drop of stream is safe immediately after SUSPENDED state.
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_native.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index bd1b74aa2068..69cf9b02ac70 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1883,8 +1883,7 @@ static int snd_pcm_drop(struct snd_pcm_substream *substream) runtime = substream->runtime; if (runtime->status->state == SNDRV_PCM_STATE_OPEN || - runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED || - runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) + runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED) return -EBADFD; snd_pcm_stream_lock_irq(substream); |