diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2016-08-23 10:27:19 +0300 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-02-10 11:04:08 +0100 |
| commit | bc90bffda9c784885e35d53d077c6486c9ea1d2a (patch) | |
| tree | e223b29b057f57857d25e2b03adeaec8b7ba5784 | |
| parent | a28d835844a523e0e0a96eb25b10a037b7662f1f (diff) | |
| download | linux-stable-bc90bffda9c784885e35d53d077c6486c9ea1d2a.tar.gz linux-stable-bc90bffda9c784885e35d53d077c6486c9ea1d2a.tar.bz2 linux-stable-bc90bffda9c784885e35d53d077c6486c9ea1d2a.zip | |
ASoC: omap-mcpdm: Fix irq resource handling
commit a8719670687c46ed2e904c0d05fa4cd7e4950cd1 upstream.
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index eb05c7ed6d05..5dc6b23b634e 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -393,8 +393,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); @@ -414,6 +414,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; |