diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-11-11 02:00:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-18 12:10:39 +0100 |
| commit | 6020779b118f6221e5d067bd1e6b44bab6fc0276 (patch) | |
| tree | 33e1917036c3192196146741d8c16451d5e2c6b0 /sound | |
| parent | Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next (diff) | |
| download | linux-6020779b118f6221e5d067bd1e6b44bab6fc0276.tar.xz linux-6020779b118f6221e5d067bd1e6b44bab6fc0276.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index b234ed663073..2e09ee8d2500 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -279,15 +279,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)); |