Commit ee057d2e authored May 10, 2016 by Kuninori Morimoto Committed by Mark Brown May 10, 2016

ASoC: rsnd: don't use prohibited number to PDMACHCRn.SRS



Current rsnd_dmapp_get_id() returns 0xFF as error code if system used
strange connection. It will be used as PDMACHCRn.SRS, but 0xFF is
prohibited number.
In order not to use prohibited number, this patch indicates error message
and returns 0x00 (same as SSI00) in error case.
Special thanks to Dung-san.

Reported-by: Nguyen Viet Dung <nv-dung@jinso.co.jp>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 1a5658c2

sound/soc/sh/rcar/dma.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -316,11 +316,15 @@ static u32 rsnd_dmapp_get_id(struct rsnd_dai_stream *io,
		size = ARRAY_SIZE(gen2_id_table_cmd);
		}

		if (!entry)
		return 0xFF;
		if ((!entry) \|\| (size <= id)) {
		struct device *dev = rsnd_priv_to_dev(rsnd_io_to_priv(io));

		if (size <= id)
		return 0xFF;
		dev_err(dev, "unknown connection (%s[%d])\n",
		rsnd_mod_name(mod), rsnd_mod_id(mod));

		/* use non-prohibited SRS number as error */
		return 0x00; /* SSI00 */
		}

		return entry[id];
		}

Admin message