summaryrefslogtreecommitdiffstats
path: root/sound/soc/uniphier/aio-cpu.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-04-23 19:01:02 +0100
committerMark Brown <broonie@kernel.org>2021-04-23 19:01:02 +0100
commitffc9841d5200a484ea0ecc645157b4d7b873f3a6 (patch)
treec5216df939963608cefcd94bdf2934a2b880b54d /sound/soc/uniphier/aio-cpu.c
parentd143a69fd452a047440391fcbe290ff416b14ab5 (diff)
parent25c4a9b614f101bb9f3e687960815db7dc439c0f (diff)
downloadlinux-ffc9841d5200a484ea0ecc645157b4d7b873f3a6.tar.bz2
Merge remote-tracking branch 'asoc/for-5.13' into asoc-next
Diffstat (limited to 'sound/soc/uniphier/aio-cpu.c')
-rw-r--r--sound/soc/uniphier/aio-cpu.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/uniphier/aio-cpu.c b/sound/soc/uniphier/aio-cpu.c
index 25c40c28eba4..cf9814130067 100644
--- a/sound/soc/uniphier/aio-cpu.c
+++ b/sound/soc/uniphier/aio-cpu.c
@@ -256,17 +256,12 @@ static int uniphier_aio_startup(struct snd_pcm_substream *substream,
{
struct uniphier_aio *aio = uniphier_priv(dai);
struct uniphier_aio_sub *sub = &aio->sub[substream->stream];
- int ret;
sub->substream = substream;
sub->pass_through = 0;
sub->use_mmap = true;
- ret = aio_init(sub);
- if (ret)
- return ret;
-
- return 0;
+ return aio_init(sub);
}
static void uniphier_aio_shutdown(struct snd_pcm_substream *substream,