瀏覽代碼

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>
Kuninori Morimoto 11 年之前
父節點
當前提交
6020779b11
共有 1 個文件被更改,包括 4 次插入6 次删除
  1. 4 6
      sound/soc/sh/rcar/core.c

+ 4 - 6
sound/soc/sh/rcar/core.c

@@ -279,15 +279,13 @@ int rsnd_dai_connect(struct rsnd_dai *rdai,
 		     struct rsnd_mod *mod,
 		     struct rsnd_mod *mod,
 		     struct rsnd_dai_stream *io)
 		     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;
 		return -EIO;
-	}
 
 
 	if (!list_empty(&mod->list)) {
 	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",
 		dev_err(dev, "%s%d is not empty\n",
 			rsnd_mod_name(mod),
 			rsnd_mod_name(mod),
 			rsnd_mod_id(mod));
 			rsnd_mod_id(mod));