diff options
author | Mark Brown <broonie@kernel.org> | 2017-01-10 05:47:48 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-01-10 05:47:48 -0500 |
commit | df3c63d39dc95dcfd70d891238b4deccac8259d6 (patch) | |
tree | 2693befa9c5c2e6fc12febb516dc64e3a7c09fc4 | |
parent | 7dfe7e18b5585719a5cc0da8bf3bf4490b36724a (diff) | |
parent | 0ea617a298dcdc2251b4e10f83ac3f3e627b66e3 (diff) |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
-rw-r--r-- | sound/soc/sh/rcar/core.c | 4 |
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, | |||
1030 | return -ENOMEM; | 1030 | return -ENOMEM; |
1031 | 1031 | ||
1032 | ret = snd_ctl_add(card, kctrl); | 1032 | ret = snd_ctl_add(card, kctrl); |
1033 | if (ret < 0) { | 1033 | if (ret < 0) |
1034 | snd_ctl_free_one(kctrl); | ||
1035 | return ret; | 1034 | return ret; |
1036 | } | ||
1037 | 1035 | ||
1038 | cfg->update = update; | 1036 | cfg->update = update; |
1039 | cfg->card = card; | 1037 | cfg->card = card; |