ASoC: rsnd: Add check for rsnd_mod_power_on

[ Upstream commit 4520458fda2e9b296313bf0dde7a92a0d665db67 ]

As rsnd_mod_power_on() can return negative numbers,
it should be better to check the return value and
deal with the exception.

Fixes: 0dfcc0d3083b ("ASoC: rsnd: use mod base common method on SSI-parent")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20220902013030.3691266-1-jiasheng@iscas.ac.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
index 7647b3d4c0baa13d3108d05e88c643029e81297f..25a8cfc274335947190f4cb3f76cc10a49cd41b8 100644 (file)
--- a/sound/soc/sh/rcar/ctu.c
+++ b/sound/soc/sh/rcar/ctu.c
@@ -171,7 +171,11 @@ static int rsnd_ctu_init(struct rsnd_mod *mod,
                         struct rsnd_dai_stream *io,
                         struct rsnd_priv *priv)
 {
-       rsnd_mod_power_on(mod);
+       int ret;
+
+       ret = rsnd_mod_power_on(mod);
+       if (ret < 0)
+               return ret;
 
        rsnd_ctu_activation(mod);
 

diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 8d91c0eb0880f17eb627bb946934b158fa3fd033..53b2ad01222b5605da0b144eb95c8a9a1209124c 100644 (file)
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -186,7 +186,11 @@ static int rsnd_dvc_init(struct rsnd_mod *mod,
                         struct rsnd_dai_stream *io,
                         struct rsnd_priv *priv)
 {
-       rsnd_mod_power_on(mod);
+       int ret;
+
+       ret = rsnd_mod_power_on(mod);
+       if (ret < 0)
+               return ret;
 
        rsnd_dvc_activation(mod);
 

diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c
index a3e0370f5704a7a3318da26061eb24307e45612e..c6fe2595c373a214a3336ee044a88af78262c99c 100644 (file)
--- a/sound/soc/sh/rcar/mix.c
+++ b/sound/soc/sh/rcar/mix.c
@@ -146,7 +146,11 @@ static int rsnd_mix_init(struct rsnd_mod *mod,
                         struct rsnd_dai_stream *io,
                         struct rsnd_priv *priv)
 {
-       rsnd_mod_power_on(mod);
+       int ret;
+
+       ret = rsnd_mod_power_on(mod);
+       if (ret < 0)
+               return ret;
 
        rsnd_mix_activation(mod);
 

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 585ffba0244b9f568685ed52323d31f7f9fcb3b4..fd52e26a3808bfbef45c9199bc5bee4cd0522947 100644 (file)
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -454,11 +454,14 @@ static int rsnd_src_init(struct rsnd_mod *mod,
                         struct rsnd_priv *priv)
 {
        struct rsnd_src *src = rsnd_mod_to_src(mod);
+       int ret;
 
        /* reset sync convert_rate */
        src->sync.val = 0;
 
-       rsnd_mod_power_on(mod);
+       ret = rsnd_mod_power_on(mod);
+       if (ret < 0)
+               return ret;
 
        rsnd_src_activation(mod);
 

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 09af402ca31f316a14d055b8a13400239beed6c8..f8960bad2bd17da6a7da18adcce9229f5ef04319 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -518,7 +518,9 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
 
        ssi->usrcnt++;
 
-       rsnd_mod_power_on(mod);
+       ret = rsnd_mod_power_on(mod);
+       if (ret < 0)
+               return ret;
 
        rsnd_ssi_config_init(mod, io);