From bc157dae224b3a482b890acb54659456f6a47f15 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Thu, 5 Sep 2019 10:51:12 +0800 Subject: Revert "ASoC: soc-pcm: remove soc_rtdcom_ack()" This reverts commit 18bd7b5ef3a313a9af1314508bca1ed982c05f75. We need the soc_rtdcom_ack() for LPA. Signed-off-by: Shengjiu Wang --- sound/soc/soc-pcm.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'sound/soc/soc-pcm.c') diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index b600d3eaaf5c..fb0f540696b8 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2818,6 +2818,26 @@ static void soc_pcm_private_free(struct snd_pcm *pcm) snd_soc_pcm_component_free(pcm); } +static int soc_rtdcom_ack(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component; + + for_each_rtdcom(rtd, rtdcom) { + component = rtdcom->component; + + if (!component->driver->ops || + !component->driver->ops->ack) + continue; + + /* FIXME. it returns 1st ask now */ + return component->driver->ops->ack(substream); + } + + return -EINVAL; +} + /* create a new pcm */ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) { @@ -2941,6 +2961,8 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) if (!ops) continue; + if (ops->ack) + rtd->ops.ack = soc_rtdcom_ack; if (ops->copy_user) rtd->ops.copy_user = snd_soc_pcm_component_copy_user; if (ops->page) -- cgit v1.2.3