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

Commit a8719670 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: omap-mcpdm: Fix irq resource handling 



Fixes: ddd17531 ("ASoC: omap-mcpdm: Clean up with devm_* function")

Managed irq request will not doing any good in ASoC probe level as it is
not going to free up the irq when the driver is unbound from the sound
card.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Reported-by: default avatarRussell King <linux@armlinux.org.uk>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 21eb45db

sound/soc/omap/omap-mcpdm.c

+3 −2
Original line number Diff line number Diff line
@@ -394,8 +394,8 @@ static int omap_mcpdm_probe(struct snd_soc_dai *dai) 
	pm_runtime_get_sync(mcpdm->dev);

	omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, 0x00);



	ret = devm_request_irq(mcpdm->dev, mcpdm->irq, omap_mcpdm_irq_handler,

				0, "McPDM", (void *)mcpdm);

	ret = request_irq(mcpdm->irq, omap_mcpdm_irq_handler, 0, "McPDM",

			  (void *)mcpdm);



	pm_runtime_put_sync(mcpdm->dev);
@@ -420,6 +420,7 @@ static int omap_mcpdm_remove(struct snd_soc_dai *dai) 
{

	struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);



	free_irq(mcpdm->irq, (void *)mcpdm);

	pm_runtime_disable(mcpdm->dev);



	return 0;