summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/ak4613.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-06-14 11:25:45 +0100
committerMark Brown <broonie@kernel.org>2022-06-14 11:25:45 +0100
commit14cc5849120051caf537f663ec620910503bb719 (patch)
treef786cd254d3a6dc104976b03e05b381d9fe5cc16 /sound/soc/codecs/ak4613.c
parent7ed1f83bb4f05fe460984ae49e98d1c1be38fb5f (diff)
parentda440af07fc3dd2b5a5138671eba51991dd1fac8 (diff)
ASoC: Merge fixes
Required for more changes for the ops.
Diffstat (limited to 'sound/soc/codecs/ak4613.c')
-rw-r--r--sound/soc/codecs/ak4613.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c
index 648208d40d06..d29d5e0db168 100644
--- a/sound/soc/codecs/ak4613.c
+++ b/sound/soc/codecs/ak4613.c
@@ -868,10 +868,12 @@ static void ak4613_parse_of(struct ak4613_priv *priv,
/*
* connected STDI
+ * TDM support is assuming it is probed via Audio-Graph-Card style here.
+ * Default is SDTIx1 if it was probed via Simple-Audio-Card for now.
*/
sdti_num = of_graph_get_endpoint_count(np);
- if (WARN_ON((sdti_num > 3) || (sdti_num < 1)))
- return;
+ if ((sdti_num >= SDTx_MAX) || (sdti_num < 1))
+ sdti_num = 1;
AK4613_CONFIG_SDTI_set(priv, sdti_num);
}