mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
ASoC: rsnd: rsnd_ssi_run_mods() needs to care ssi_parent_mod
[ Upstream commit 21781e8788
]
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>
This commit is contained in:
parent
f7ee900a4f
commit
556787a174
1 changed files with 8 additions and 3 deletions
|
@ -198,10 +198,15 @@ static u32 rsnd_ssi_run_mods(struct rsnd_dai_stream *io)
|
|||
{
|
||||
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)
|
||||
|
|
Loading…
Reference in a new issue