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

Commit 116bcd9c authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: wm9081: fix resource reclaim in wm9081_register error path 



This patch fixes the error path in wm9081_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 d484366b

sound/soc/codecs/wm9081.c

+6 −5
Original line number Diff line number Diff line
@@ -1356,7 +1356,7 @@ static int wm9081_register(struct wm9081_priv *wm9081, 
	ret = snd_soc_codec_set_cache_io(codec, 8, 16, control);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);

		return ret;

		goto err;

	}



	reg = snd_soc_read(codec, WM9081_SOFTWARE_RESET);
@@ -1369,7 +1369,7 @@ static int wm9081_register(struct wm9081_priv *wm9081, 
	ret = wm9081_reset(codec);

	if (ret < 0) {

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

		return ret;

		goto err;

	}



	wm9081_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
@@ -1388,18 +1388,19 @@ static int wm9081_register(struct wm9081_priv *wm9081, 
	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(&wm9081_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(wm9081);

	return ret;