summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/rcar/mix.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 12:12:20 +0100
committerMark Brown <broonie@kernel.org>2017-09-01 12:12:20 +0100
commit94e26c07002fa01fa807c68c6b44355b79ba82ac (patch)
tree2e021b07ae30d905767a915288ac8bef3cd1d190 /sound/soc/sh/rcar/mix.c
parent460f623a6e3cab02c3cda52cf64094a96afece4e (diff)
parenta5702e1cb3c47221419617089d59f9741cf981e4 (diff)
downloadlinux-94e26c07002fa01fa807c68c6b44355b79ba82ac.tar.bz2
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'sound/soc/sh/rcar/mix.c')
-rw-r--r--sound/soc/sh/rcar/mix.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c
index 195fc7bb22af..6c4826c189a4 100644
--- a/sound/soc/sh/rcar/mix.c
+++ b/sound/soc/sh/rcar/mix.c
@@ -168,13 +168,16 @@ int rsnd_mix_probe(struct rsnd_priv *priv)
clk = devm_clk_get(dev, name);
if (IS_ERR(clk)) {
ret = PTR_ERR(clk);
+ of_node_put(np);
goto rsnd_mix_probe_done;
}
ret = rsnd_mod_init(priv, rsnd_mod_get(mix), &rsnd_mix_ops,
clk, rsnd_mod_get_status, RSND_MOD_MIX, i);
- if (ret)
+ if (ret) {
+ of_node_put(np);
goto rsnd_mix_probe_done;
+ }
i++;
}