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

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

ASoC: wm8523: fix resource reclaim in wm8523_register error path 



This patch includes below fixes:
1. If another WM8523 is registered, need to kfree wm8523 before return -EINVAL.
2. If snd_soc_register_codec failed, goto error path to properly free resources.
3. Instead of using mixed in-line and goto style cleanup, use goto style error
   handling if snd_soc_register_dai failed.

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 085efd28

sound/soc/codecs/wm8523.c

+6 −4
Original line number Diff line number Diff line
@@ -482,7 +482,8 @@ static int wm8523_register(struct wm8523_priv *wm8523, 


	if (wm8523_codec) {

		dev_err(codec->dev, "Another WM8523 is registered\n");

		return -EINVAL;

		ret = -EINVAL;

		goto err;

	}



	mutex_init(&codec->mutex);
@@ -570,18 +571,19 @@ static int wm8523_register(struct wm8523_priv *wm8523, 
	ret = snd_soc_register_codec(codec);

	if (ret != 0) {

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

		return ret;

		goto err_enable;

	}



	ret = snd_soc_register_dai(&wm8523_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_enable:

	regulator_bulk_disable(ARRAY_SIZE(wm8523->supplies), wm8523->supplies);

err_get: