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

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

ASoC: wm8904: fix resource reclaim in wm8904_register error path 



This patch includes below fixes:
1. wm8904 need to be kfreed in wm8904_register() error path before return.
2. fix the error path for snd_soc_register_codec() fail and
   snd_soc_register_dai() fail 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 2c2749de

sound/soc/codecs/wm8904.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -2433,7 +2433,8 @@ static int wm8904_register(struct wm8904_priv *wm8904, 




	if (wm8904_codec) {

	if (wm8904_codec) {

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

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

		return -EINVAL;

		ret = -EINVAL;

		goto err;

	}

	}





	mutex_init(&codec->mutex);

	mutex_init(&codec->mutex);
@@ -2462,7 +2463,8 @@ static int wm8904_register(struct wm8904_priv *wm8904, 
	default:

	default:

		dev_err(codec->dev, "Unknown device type %d\n",

		dev_err(codec->dev, "Unknown device type %d\n",

			wm8904->devtype);

			wm8904->devtype);

		return -EINVAL;

		ret = -EINVAL;

		goto err;

	}

	}





	memcpy(codec->reg_cache, wm8904_reg, sizeof(wm8904_reg));

	memcpy(codec->reg_cache, wm8904_reg, sizeof(wm8904_reg));
@@ -2566,18 +2568,19 @@ static int wm8904_register(struct wm8904_priv *wm8904, 
	ret = snd_soc_register_codec(codec);

	ret = snd_soc_register_codec(codec);

	if (ret != 0) {

	if (ret != 0) {

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

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

		return ret;

		goto err_enable;

	}

	}





	ret = snd_soc_register_dai(&wm8904_dai);

	ret = snd_soc_register_dai(&wm8904_dai);

	if (ret != 0) {

	if (ret != 0) {

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

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

		snd_soc_unregister_codec(codec);

		goto err_codec;

		return ret;

	}

	}





	return 0;

	return 0;





err_codec:

	snd_soc_unregister_codec(codec);

err_enable:

err_enable:

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

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

err_get:

err_get: