| commit | df3c63d39dc95dcfd70d891238b4deccac8259d6 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Tue Jan 10 10:47:48 2017 +0000 |
| committer | Mark Brown <broonie@kernel.org> | Tue Jan 10 10:47:48 2017 +0000 |
| tree | 2693befa9c5c2e6fc12febb516dc64e3a7c09fc4 | |
| parent | 7dfe7e18b5585719a5cc0da8bf3bf4490b36724a [diff] | |
| parent | 0ea617a298dcdc2251b4e10f83ac3f3e627b66e3 [diff] |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 4bd68de..99b5b08 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;