Commit df3c63d3 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 7dfe7e18 0ea617a2

sound/soc/sh/rcar/core.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1030,10 +1030,8 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod, 
		return -ENOMEM;

		return -ENOMEM;





	ret = snd_ctl_add(card, kctrl);

	ret = snd_ctl_add(card, kctrl);

	if (ret < 0) {

	if (ret < 0)

		snd_ctl_free_one(kctrl);

		return ret;

		return ret;

	}





	cfg->update = update;

	cfg->update = update;

	cfg->card = card;

	cfg->card = card;