summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-12-17 02:56:50 +0000
committerMark Brown <broonie@kernel.org>2015-12-18 12:10:56 +0000
commit49ee73b441f5734c3da254c60e134f343b89911a (patch)
treea3a1aad83daa9a568725bdff62c913dcd2b4f665 /sound/soc
parent52dc68524327ed7bedfc2856bca4fa634f11141a (diff)
downloadlinux-stable-49ee73b441f5734c3da254c60e134f343b89911a.tar.gz
linux-stable-49ee73b441f5734c3da254c60e134f343b89911a.tar.bz2
linux-stable-49ee73b441f5734c3da254c60e134f343b89911a.zip
ASoC: rsnd: SSI/SSIU use rsnd_get_slot_extend() to check TDM
Current SSI/SSIU are using rsnd_get_slot_runtime() to check TDM, but using rsnd_get_slot_extend() is more sane. This patch fix it up Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/sh/rcar/ssi.c2
-rw-r--r--sound/soc/sh/rcar/ssiu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 79c3211a1e7f..7481bc3e0dff 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -267,7 +267,7 @@ static int rsnd_ssi_config_init(struct rsnd_ssi *ssi,
u32 wsr;
int is_tdm;
- is_tdm = (rsnd_get_slot_runtime(io) >= 6) ? 1 : 0;
+ is_tdm = (rsnd_get_slot_extend(io) >= 6) ? 1 : 0;
/*
* always use 32bit system word.
diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
index 326550114299..c7f89beff44f 100644
--- a/sound/soc/sh/rcar/ssiu.c
+++ b/sound/soc/sh/rcar/ssiu.c
@@ -78,7 +78,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
if (ret < 0)
return ret;
- if (rsnd_get_slot_runtime(io) >= 6) {
+ if (rsnd_get_slot_extend(io) >= 6) {
/*
* TDM Extend Mode
* see