Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
broonie committed Jan 10, 2017
2 parents 7dfe7e1 + 0ea617a commit df3c63d
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions sound/soc/sh/rcar/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit df3c63d

Please sign in to comment.