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

Commit e7ac4fb6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/compress' into asoc-next

parents b8e58d4e 3d24cfe4

sound/soc/soc-compress.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -149,7 +149,8 @@ static int soc_compr_free(struct snd_compr_stream *cstream) 
					SND_SOC_DAPM_STREAM_STOP);

					SND_SOC_DAPM_STREAM_STOP);

		} else {

		} else {

			rtd->pop_wait = 1;

			rtd->pop_wait = 1;

			schedule_delayed_work(&rtd->delayed_work,

			queue_delayed_work(system_power_efficient_wq,

					   &rtd->delayed_work,

					   msecs_to_jiffies(rtd->pmdown_time));

					   msecs_to_jiffies(rtd->pmdown_time));

		}

		}

	} else {

	} else {
@@ -334,7 +335,7 @@ static int soc_compr_copy(struct snd_compr_stream *cstream, 
	return ret;

	return ret;

}

}





static int sst_compr_set_metadata(struct snd_compr_stream *cstream,

static int soc_compr_set_metadata(struct snd_compr_stream *cstream,

				struct snd_compr_metadata *metadata)

				struct snd_compr_metadata *metadata)

{

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
@@ -347,7 +348,7 @@ static int sst_compr_set_metadata(struct snd_compr_stream *cstream, 
	return ret;

	return ret;

}

}





static int sst_compr_get_metadata(struct snd_compr_stream *cstream,

static int soc_compr_get_metadata(struct snd_compr_stream *cstream,

				struct snd_compr_metadata *metadata)

				struct snd_compr_metadata *metadata)

{

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
@@ -364,8 +365,8 @@ static struct snd_compr_ops soc_compr_ops = { 
	.open		= soc_compr_open,

	.open		= soc_compr_open,

	.free		= soc_compr_free,

	.free		= soc_compr_free,

	.set_params	= soc_compr_set_params,

	.set_params	= soc_compr_set_params,

	.set_metadata   = sst_compr_set_metadata,

	.set_metadata   = soc_compr_set_metadata,

	.get_metadata	= sst_compr_get_metadata,

	.get_metadata	= soc_compr_get_metadata,

	.get_params	= soc_compr_get_params,

	.get_params	= soc_compr_get_params,

	.trigger	= soc_compr_trigger,

	.trigger	= soc_compr_trigger,

	.pointer	= soc_compr_pointer,

	.pointer	= soc_compr_pointer,