| From c1f3ff3bbdbb555bec65e5892a34b70c208abc5e Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Sun, 10 Nov 2013 17:00:42 -0800 |
| Subject: ASoC: rcar: fixup mod access before checking |
| |
| rsnd_dai_connect() is using mod before NULL checking. |
| This patch fixes it up |
| |
| Reported-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| (cherry picked from commit 6020779b118f6221e5d067bd1e6b44bab6fc0276) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 10 ++++------ |
| 1 file changed, 4 insertions(+), 6 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c |
| index 839eee3208dc..ae1a5ed8974e 100644 |
| --- a/sound/soc/sh/rcar/core.c |
| +++ b/sound/soc/sh/rcar/core.c |
| @@ -333,15 +333,13 @@ int rsnd_dai_connect(struct rsnd_dai *rdai, |
| 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); |
| - |
| - if (!mod) { |
| - dev_err(dev, "NULL mod\n"); |
| + if (!mod) |
| return -EIO; |
| - } |
| |
| if (!list_empty(&mod->list)) { |
| + struct rsnd_priv *priv = rsnd_mod_to_priv(mod); |
| + struct device *dev = rsnd_priv_to_dev(priv); |
| + |
| dev_err(dev, "%s%d is not empty\n", |
| rsnd_mod_name(mod), |
| rsnd_mod_id(mod)); |
| -- |
| 1.8.5.rc3 |
| |
