lkml.org 
[lkml]   [2017]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 095/178] ASoC: rsnd: rsnd_ssi_run_mods() needs to care ssi_parent_mod
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>


    [ Upstream commit 21781e87881f9c420871b1d1f3f29d4cd7bffb10 ]

    SSI parent mod might be NULL. ssi_parent_mod() needs to care
    about it. Otherwise, it uses negative shift.
    This patch fixes it.

    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/sh/rcar/ssi.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    --- a/sound/soc/sh/rcar/ssi.c
    +++ b/sound/soc/sh/rcar/ssi.c
    @@ -198,10 +198,15 @@ static u32 rsnd_ssi_run_mods(struct rsnd
    {
    struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io);
    struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io);
    + u32 mods;

    - return rsnd_ssi_multi_slaves_runtime(io) |
    - 1 << rsnd_mod_id(ssi_mod) |
    - 1 << rsnd_mod_id(ssi_parent_mod);
    + mods = rsnd_ssi_multi_slaves_runtime(io) |
    + 1 << rsnd_mod_id(ssi_mod);
    +
    + if (ssi_parent_mod)
    + mods |= 1 << rsnd_mod_id(ssi_parent_mod);
    +
    + return mods;
    }

    u32 rsnd_ssi_multi_slaves_runtime(struct rsnd_dai_stream *io)

    \
     
     \ /
      Last update: 2017-12-18 17:15    [W:4.307 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site