projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21eb45d
)
ASoC: omap-mcpdm: Fix irq resource handling
author
Peter Ujfalusi
<peter.ujfalusi@ti.com>
Tue, 23 Aug 2016 07:27:19 +0000
(10:27 +0300)
committer
Mark Brown
<broonie@kernel.org>
Tue, 23 Aug 2016 11:00:47 +0000
(12:00 +0100)
Fixes:
ddd17531ad908
("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: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reported-by: Russell King <linux@armlinux.org.uk>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/omap/omap-mcpdm.c
patch
|
blob
|
history
diff --git
a/sound/soc/omap/omap-mcpdm.c
b/sound/soc/omap/omap-mcpdm.c
index
74d6e6f
..
64609c7
100644
(file)
--- a/
sound/soc/omap/omap-mcpdm.c
+++ b/
sound/soc/omap/omap-mcpdm.c
@@
-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;