Commit 019433db authored Nov 01, 2017 by Kuninori Morimoto Committed by Greg Kroah-Hartman Dec 20, 2017

ASoC: rsnd: rsnd_ssi_run_mods() needs to care ssi_parent_mod




[ 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>

parent cf16dac8

sound/soc/sh/rcar/ssi.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -172,10 +172,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)