summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorNilkanth Ahirrao <anilkanth@jp.adit-jv.com>2019-06-18 14:19:53 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-26 09:10:29 +0200
commit38bded12152dfd85e98528940bf3e1f46544bf89 (patch)
tree37edc9f3c75f790a751ad51651924540b00d881f /sound
parent255333f141535e728b9c213dc8859798a7615c22 (diff)
downloadlinux-stable-38bded12152dfd85e98528940bf3e1f46544bf89.tar.gz
linux-stable-38bded12152dfd85e98528940bf3e1f46544bf89.tar.bz2
linux-stable-38bded12152dfd85e98528940bf3e1f46544bf89.zip
ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_
[ Upstream commit ac28ec07ae1c5c1e18ed6855eb105a328418da88 ] commit c16015f36cc1 ("ASoC: rsnd: add .get_id/.get_id_sub") introduces rsnd_ctu_id which calcualates and gives the main Device id of the CTU by dividing the id by 4. rsnd_mod_id uses this interface to get the CTU main Device id. But this commit forgets to revert the main Device id calcution previously done in rsnd_ctu_probe_ which also divides the id by 4. This path corrects the same to get the correct main Device id. The issue is observered when rsnd_ctu_probe_ is done for CTU1 Fixes: c16015f36cc1 ("ASoC: rsnd: add .get_id/.get_id_sub") Signed-off-by: Nilkanth Ahirrao <anilkanth@jp.adit-jv.com> Signed-off-by: Suresh Udipi <sudipi@jp.adit-jv.com> Signed-off-by: Jiada Wang <jiada_wang@mentor.com> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sh/rcar/ctu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
index 8cb06dab234e..7647b3d4c0ba 100644
--- a/sound/soc/sh/rcar/ctu.c
+++ b/sound/soc/sh/rcar/ctu.c
@@ -108,7 +108,7 @@ static int rsnd_ctu_probe_(struct rsnd_mod *mod,
struct rsnd_dai_stream *io,
struct rsnd_priv *priv)
{
- return rsnd_cmd_attach(io, rsnd_mod_id(mod) / 4);
+ return rsnd_cmd_attach(io, rsnd_mod_id(mod));
}
static void rsnd_ctu_value_init(struct rsnd_dai_stream *io,