mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

ASoC: rsnd: Add check for rsnd_mod_power_on

Browse source 
[ Upstream commit 376be51caf ]

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

Fixes: e7d850dd10 ("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>
This commit is contained in:
Jiasheng Jiang 2022-09-02 09:30:30 +08:00 committed by Greg Kroah-Hartman
parent 877e92e9b1
commit f0fb0817eb
5 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/soc/sh/rcar/ctu.c
View file

@ -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);

6
sound/soc/sh/rcar/dvc.c
View file

@ -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);

6
sound/soc/sh/rcar/mix.c
View file

@ -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);

5
sound/soc/sh/rcar/src.c
View file

@ -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);

4
sound/soc/sh/rcar/ssi.c
View file

@ -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);