From d3b9d1bc0d4cc64896150bf510d40981942f2806 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 16 Jul 2020 11:43:19 +0200 Subject: [PATCH] Revert "ALSA: compress: fix partial_drain completion state" This reverts commit ab8dbdcbfbf8e2f225ea1b74485304652c2b0f90 which is commit f79a732a8325dfbd570d87f1435019d7e5501c6d upstream as it breaks the ABI for sound drivers and we don't need the change in the android trees at this point in time. Signed-off-by: Greg Kroah-Hartman Change-Id: Ia2e874e50aa4a233fe6edca3f20781060aaa3248 --- include/sound/compress_driver.h | 10 +--------- sound/core/compress_offload.c | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index 28b115b6088a..325c72ad8fda 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -57,7 +57,6 @@ struct snd_compr_runtime { * @direction: stream direction, playback/recording * @metadata_set: metadata set flag, true when set * @next_track: has userspace signal next track transition, true when set - * @partial_drain: undergoing partial_drain for stream, true when set * @private_data: pointer to DSP private data */ struct snd_compr_stream { @@ -69,7 +68,6 @@ struct snd_compr_stream { enum snd_compr_direction direction; bool metadata_set; bool next_track; - bool partial_drain; void *private_data; struct snd_soc_pcm_runtime *be; }; @@ -178,13 +176,7 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) if (snd_BUG_ON(!stream)) return; - /* for partial_drain case we are back to running state on success */ - if (stream->partial_drain) { - stream->runtime->state = SNDRV_PCM_STATE_RUNNING; - stream->partial_drain = false; /* clear this flag as well */ - } else { - stream->runtime->state = SNDRV_PCM_STATE_SETUP; - } + stream->runtime->state = SNDRV_PCM_STATE_SETUP; wake_up(&stream->runtime->sleep); } diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 4f8e0c8752ee..1bf0397175c3 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -723,9 +723,6 @@ static int snd_compr_stop(struct snd_compr_stream *stream) retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_STOP); if (!retval) { - /* clear flags and stop any drain wait */ - stream->partial_drain = false; - stream->metadata_set = false; snd_compr_drain_notify(stream); stream->runtime->total_bytes_available = 0; stream->runtime->total_bytes_transferred = 0; @@ -883,7 +880,6 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) if (stream->next_track == false) return -EPERM; - stream->partial_drain = true; retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_PARTIAL_DRAIN); if (retval) { pr_debug("Partial drain returned failure\n");