]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
authorMark Brown <broonie@kernel.org>
Tue, 10 Jan 2017 10:47:48 +0000 (10:47 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 10 Jan 2017 10:47:48 +0000 (10:47 +0000)
sound/soc/sh/rcar/core.c

index 4bd68de761309b57285bf203aa2ee46cabc440cc..99b5b0835c1e840c66e45676ff81cd57a4c1875c 100644 (file)
@@ -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;