Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f63bb101 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "ALSA: compress: fix partial_drain completion state" 



This reverts commit 1c54d0d9 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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia2e874e50aa4a233fe6edca3f20781060aaa3248
parent c7725aec

include/sound/compress_driver.h

+1 −9
Original line number Diff line number Diff line
@@ -59,7 +59,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 {
@@ -71,7 +70,6 @@ struct snd_compr_stream { 
	enum snd_compr_direction direction;

	bool metadata_set;

	bool next_track;

	bool partial_drain;

	void *private_data;

};
@@ -175,13 +173,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;

	}



	wake_up(&stream->runtime->sleep);

}

sound/core/compress_offload.c

+0 −4
Original line number Diff line number Diff line
@@ -722,9 +722,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;
@@ -882,7 +879,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");