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

Commit 896adcfe authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Fix memleak in machine probe"

parents 8eaba561 cd51c0ed

sound/soc/msm/msm8952-slimbus.c

+4 −0
Original line number Diff line number Diff line
@@ -2444,6 +2444,8 @@ err: 
		iounmap(pdata->vaddr_gpio_mux_spkr_ctl);

	if (pdata->vaddr_gpio_mux_mic_ctl)

		iounmap(pdata->vaddr_gpio_mux_mic_ctl);

	if (pdata->vaddr_gpio_mux_pcm_ctl)

		iounmap(pdata->vaddr_gpio_mux_pcm_ctl);

	if (pdata->vaddr_gpio_mux_quin_ctl)

		iounmap(pdata->vaddr_gpio_mux_quin_ctl);

	cancel_delayed_work_sync(&pdata->hs_detect_dwork);
@@ -2466,6 +2468,8 @@ static int msm8952_asoc_machine_remove(struct platform_device *pdev) 
		iounmap(pdata->vaddr_gpio_mux_spkr_ctl);

	if (pdata->vaddr_gpio_mux_mic_ctl)

		iounmap(pdata->vaddr_gpio_mux_mic_ctl);

	if (pdata->vaddr_gpio_mux_pcm_ctl)

		iounmap(pdata->vaddr_gpio_mux_pcm_ctl);

	if (pdata->vaddr_gpio_mux_quin_ctl)

		iounmap(pdata->vaddr_gpio_mux_quin_ctl);