Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b5d071e authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: wm8961: fix resource reclaim in wm8961_register error path 



This patch fixes the error path in wm8961_register to properly free resources.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8089a49d

sound/soc/codecs/wm8961.c

+5 −4
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ static int wm8961_register(struct wm8961_priv *wm8961) 
	ret = wm8961_reset(codec);

	if (ret < 0) {

		dev_err(codec->dev, "Failed to issue reset\n");

		return ret;

		goto err;

	}



	/* Enable class W */
@@ -1147,18 +1147,19 @@ static int wm8961_register(struct wm8961_priv *wm8961) 
	ret = snd_soc_register_codec(codec);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to register codec: %d\n", ret);

		return ret;

		goto err;

	}



	ret = snd_soc_register_dai(&wm8961_dai);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to register DAI: %d\n", ret);

		snd_soc_unregister_codec(codec);

		return ret;

		goto err_codec;

	}



	return 0;



err_codec:

	snd_soc_unregister_codec(codec);

err:

	kfree(wm8961);

	return ret;