Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

df3c63d3 · Mark Brown · 7dfe7e18 · 0ea617a2 · df3c63d3
Commit df3c63d3 authored Jan 10, 2017 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

sound/soc/sh/rcar/core.c sound/soc/sh/rcar/core.c +1 -3

No files found.
--- 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;