| From e9ce9c88e7154850b8b37cc8268c5f28e419aa3f Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Tue, 21 Jul 2015 00:03:35 +0000 |
| Subject: [PATCH 307/326] ASoC: rsnd: tidyup parameter assignment position |
| |
| 84e95355602c("ASoC: rsnd: show debug message for SSI/SRC/DVC connection") |
| added debug message on rsnd_dai_connect(), but the relationship of |
| parameter check was absurdity. This patch tidyup it. |
| It is reported via Smatch/Dan |
| |
| Reported-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| (cherry picked from commit 48725e9cc841da395bfd74e7691bba91613d3517) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c |
| index 927a7b02123b..f3feed5ce9b6 100644 |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -332,12 +332,15 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) |
| static int rsnd_dai_connect(struct rsnd_mod *mod, |
| struct rsnd_dai_stream *io) |
| { |
| - struct rsnd_priv *priv = rsnd_mod_to_priv(mod); |
| - struct device *dev = rsnd_priv_to_dev(priv); |
| + struct rsnd_priv *priv; |
| + struct device *dev; |
| |
| if (!mod) |
| return -EIO; |
| |
| + priv = rsnd_mod_to_priv(mod); |
| + dev = rsnd_priv_to_dev(priv); |
| + |
| io->mod[mod->type] = mod; |
| |
| dev_dbg(dev, "%s[%d] is connected to io (%s)\n", |
| -- |
| 2.6.2 |
| |