Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ac2045d authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

ASoC: rsnd: Add check for rsnd_mod_power_on 



[ Upstream commit 376be51caf8871419bbcbb755e1e615d30dc3153 ]

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

Fixes: e7d850dd ("ASoC: rsnd: use mod base common method on SSI-parent")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20220902013030.3691266-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1daf6922

sound/soc/sh/rcar/ctu.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/sh/rcar/dvc.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/sh/rcar/mix.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/sh/rcar/src.c

+4 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/sh/rcar/ssi.c

+3 −1
Original line number Diff line number Diff line
@@ -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);