diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-06-25 11:56:17 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-06-25 11:56:22 +0200 |
| commit | 6f7dae64150229b898da0445480ede94b27d5522 (patch) | |
| tree | d2e5e23845d88e19abea717ca9e6cbe35c06ca4e /sound/core/pcm_native.c | |
| parent | 634f3b4e7dde3827e3b81306416ec306b323e39b (diff) | |
| parent | 6a7db25aad8ce6512b366d2ce1d0e60bac00a09d (diff) | |
| download | linux-6f7dae64150229b898da0445480ede94b27d5522.tar.gz linux-6f7dae64150229b898da0445480ede94b27d5522.tar.bz2 linux-6f7dae64150229b898da0445480ede94b27d5522.zip | |
Merge branch 'for-linus' into for-next
Pull 6.10-rc devel branch for further cleanups of dmaengine and others.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/pcm_native.c')
| -rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 521ba56392a0..c152ccf32214 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1775,6 +1775,8 @@ static int snd_pcm_pre_resume(struct snd_pcm_substream *substream, snd_pcm_state_t state) { struct snd_pcm_runtime *runtime = substream->runtime; + if (runtime->state != SNDRV_PCM_STATE_SUSPENDED) + return -EBADFD; if (!(runtime->info & SNDRV_PCM_INFO_RESUME)) return -ENOSYS; runtime->trigger_master = substream; |