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

Commit 66225e98 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: wm_adsp: free memory when unloaded or closed 



The patch adds a wm_adsp2_remove() function to ensure that memory
is freed when the driver is unloaded or shut down.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2ab8e744

sound/soc/codecs/wm_adsp.c

+20 −0
Original line number Diff line number Diff line
@@ -944,6 +944,13 @@ static void wm_adsp_ctl_work(struct work_struct *work) 
	kfree(ctl_work);

}



static void wm_adsp_free_ctl_blk(struct wm_coeff_ctl *ctl)

{

	kfree(ctl->cache);

	kfree(ctl->name);

	kfree(ctl);

}



static int wm_adsp_create_control(struct wm_adsp *dsp,

				  const struct wm_adsp_alg_region *alg_region,

				  unsigned int offset, unsigned int len,
@@ -2340,6 +2347,19 @@ int wm_adsp2_init(struct wm_adsp *dsp) 
}

EXPORT_SYMBOL_GPL(wm_adsp2_init);



void wm_adsp2_remove(struct wm_adsp *dsp)

{

	struct wm_coeff_ctl *ctl;



	while (!list_empty(&dsp->ctl_list)) {

		ctl = list_first_entry(&dsp->ctl_list, struct wm_coeff_ctl,

					list);

		list_del(&ctl->list);

		wm_adsp_free_ctl_blk(ctl);

	}

}

EXPORT_SYMBOL_GPL(wm_adsp2_remove);



int wm_adsp_compr_open(struct wm_adsp *dsp, struct snd_compr_stream *stream)

{

	struct wm_adsp_compr *compr;

sound/soc/codecs/wm_adsp.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ extern const struct snd_kcontrol_new wm_adsp_fw_controls[]; 


int wm_adsp1_init(struct wm_adsp *dsp);

int wm_adsp2_init(struct wm_adsp *dsp);

void wm_adsp2_remove(struct wm_adsp *dsp);

int wm_adsp2_codec_probe(struct wm_adsp *dsp, struct snd_soc_codec *codec);

int wm_adsp2_codec_remove(struct wm_adsp *dsp, struct snd_soc_codec *codec);

int wm_adsp1_event(struct snd_soc_dapm_widget *w,