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

Unverified Commit b84acf44 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

ASoC: Revert "ASoC: soc-generic-dmaengine-pcm: Fix error handling" 



This reverts commit f91b1e73.

As explained by Lars-Peter Clausen:

"This creates a resource leak. dmaengine_pcm_request_chan_of() requests
bothtransmit and receive channels. It might return with an error if one
of them fails, but the other one succeeded. In this case we need to call
dmaengine_pcm_release_chan() to free the requested channel"

So revert the commit.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 78648092

sound/soc/soc-generic-dmaengine-pcm.c

+1 −2
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ int snd_dmaengine_pcm_register(struct device *dev, 


	ret = dmaengine_pcm_request_chan_of(pcm, dev, config);

	if (ret)

		goto err_free_pcm;

		goto err_free_dma;



	if (config && config->process)

		ret = snd_soc_add_component(dev, &pcm->component,
@@ -520,7 +520,6 @@ int snd_dmaengine_pcm_register(struct device *dev, 


err_free_dma:

	dmaengine_pcm_release_chan(pcm);

err_free_pcm:

	kfree(pcm);

	return ret;

}