diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:00:43 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:00:43 +0800 |
| commit | d7ba9dc82699535ee36e2cf8f10d992f2a5bddae (patch) | |
| tree | 9e62a5a63e486cd205be35d7dd14342462b422a8 /sound/soc/soc-pcm.c | |
| parent | f543f63f55e93400048dc2d31c4356d3ffc9a34d (diff) | |
| parent | dfb874e95e3aa46b43b8940b6e921cf753eda947 (diff) | |
Merge remote-tracking branch 'origin/audio/rpmsg' into audio/next
* origin/audio/rpmsg: (59 commits)
LF-215: ASoC: fsl_rpmsg_i2s: Enable WQ_FREEZABLE for workqueue
ASoC: imx-pcm-rpmsg: Remove the prtd
ASoC: imx-pcm-rpmsg: Fix writecombine/wc build error
ASoC: rpmsg_ak4497: ignore suspend with DAPM
Revert "ASoC: soc-pcm: remove soc_rtdcom_ack()"
...
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 0eed248a1c4b..c2a78174f249 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) |