Skip to contentSkip to conversation

ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_

PATCH In review Jiada Wang 3 participants 3 messages Jun 18, 2019

Subsystems (3)
lore
Share & tools
lore

Jiada Wang

author
#0 lore raw

PATCH v2 1/1 ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_

From: Nilkanth Ahirrao <[email protected]>

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")

---
v2: fixed commit id

v1: initial version

---
 sound/soc/sh/rcar/ctu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sh/rcar/ctu.c +1 -1
index 8cb06dab234e..7647b3d4c0ba 100644
@@ -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,
Signature · 1 line
2.19.2
Acked-by on v2 1/1
#1 lore raw

Hi

Quoted 11 lines

From: Nilkanth Ahirrao <[email protected]>

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.

Quoted 8 lines

The issue is observered when rsnd_ctu_probe_ is done for CTU1

Fixes c16015f36cc1 ("ASoC: rsnd: add .get_id/.get_id_sub")

---

maintainer
#2 lore raw

Applied "ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_" to the asoc tree

In reply to Jiada Wang

The patch

ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From ac28ec07ae1c5c1e18ed6855eb105a328418da88 Mon Sep 17 00:00:00 2001

From: Nilkanth Ahirrao <[email protected]>
Date: Tue, 18 Jun 2019 14:19:53 +0900
Subject: [PATCH] ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_

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")
---
 sound/soc/sh/rcar/ctu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sh/rcar/ctu.c +1 -1
index 8cb06dab234e..7647b3d4c0ba 100644
@@ -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,
Signature · 1 line
2.20.1