lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 096/255] ASoC: rsnd: Add check for rsnd_mod_power_on
    Date
    From: Jiasheng Jiang <jiasheng@iscas.ac.cn>

    [ 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: e7d850dd10f4 ("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>
    ---
    sound/soc/sh/rcar/ctu.c | 6 +++++-
    sound/soc/sh/rcar/dvc.c | 6 +++++-
    sound/soc/sh/rcar/mix.c | 6 +++++-
    sound/soc/sh/rcar/src.c | 5 ++++-
    sound/soc/sh/rcar/ssi.c | 4 +++-
    5 files changed, 22 insertions(+), 5 deletions(-)

    diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
    index 7647b3d4c0ba..25a8cfc27433 100644
    --- 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 8d91c0eb0880..53b2ad01222b 100644
    --- 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 a3e0370f5704..c6fe2595c373 100644
    --- 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 585ffba0244b..fd52e26a3808 100644
    --- 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 09af402ca31f..f8960bad2bd1 100644
    --- 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);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 23:44    [W:4.027 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site