summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-01-10 10:47:48 +0000
committerMark Brown <broonie@kernel.org>2017-01-10 10:47:48 +0000
commitdf3c63d39dc95dcfd70d891238b4deccac8259d6 (patch)
tree2693befa9c5c2e6fc12febb516dc64e3a7c09fc4 /sound
parent7dfe7e18b5585719a5cc0da8bf3bf4490b36724a (diff)
parent0ea617a298dcdc2251b4e10f83ac3f3e627b66e3 (diff)
downloadlinux-df3c63d39dc95dcfd70d891238b4deccac8259d6.tar.gz
linux-df3c63d39dc95dcfd70d891238b4deccac8259d6.tar.bz2
linux-df3c63d39dc95dcfd70d891238b4deccac8259d6.zip
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sh/rcar/core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 4bd68de76130..99b5b0835c1e 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1030,10 +1030,8 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
return -ENOMEM;
ret = snd_ctl_add(card, kctrl);
- if (ret < 0) {
- snd_ctl_free_one(kctrl);
+ if (ret < 0)
return ret;
- }
cfg->update = update;
cfg->card = card;