Unverified Commit 798590cc authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

ASoC: codecs: wcd934x: fix resource leaks on component remove 



Make sure to release allocated MBHC resources also on component remove.

This is specifically needed to allow probe deferrals of the sound card
which otherwise fails when reprobing the codec component.

Fixes: 9fb9b169 ("ASoC: codecs: wcd934x: add mbhc support")
Cc: stable@vger.kernel.org      # 5.14
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230705123018.30903-6-johan+linaro@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a3406f87

sound/soc/codecs/wcd934x.c

+12 −0
Original line number Diff line number Diff line
@@ -3044,6 +3044,17 @@ static int wcd934x_mbhc_init(struct snd_soc_component *component) 


	return 0;

}



static void wcd934x_mbhc_deinit(struct snd_soc_component *component)

{

	struct wcd934x_codec *wcd = snd_soc_component_get_drvdata(component);



	if (!wcd->mbhc)

		return;



	wcd_mbhc_deinit(wcd->mbhc);

}



static int wcd934x_comp_probe(struct snd_soc_component *component)

{

	struct wcd934x_codec *wcd = dev_get_drvdata(component->dev);
@@ -3077,6 +3088,7 @@ static void wcd934x_comp_remove(struct snd_soc_component *comp) 
{

	struct wcd934x_codec *wcd = dev_get_drvdata(comp->dev);



	wcd934x_mbhc_deinit(comp);

	wcd_clsh_ctrl_free(wcd->clsh_ctrl);

}