ASoC: codecs: wm0010: Fix error handling path in wm0010_spi_probe()

[ Upstream commit ed92bc5264c4357d4fca292c769ea9967cd3d3b6 ]

Free some resources in the error handling path of the probe, as already
done in the remove function.

Fixes: e3523e01869d ("ASoC: wm0010: Add initial wm0010 DSP driver")
Fixes: fd8b96574456 ("ASoC: wm0010: Clear IRQ as wake source and include missing header")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/5139ba1ab8c4c157ce04e56096a0f54a1683195c.1741549792.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 28b4656c4e1491603d9dfa5478b5e20138328656..b2f87af1bfc8763a0ee1b747cb7f0cfbf82a0c04 100644 (file)
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -952,7 +952,7 @@ static int wm0010_spi_probe(struct spi_device *spi)
        if (ret) {
                dev_err(wm0010->dev, "Failed to set IRQ %d as wake source: %d\n",
                        irq, ret);
-               return ret;
+               goto free_irq;
        }
 
        if (spi->max_speed_hz)
@@ -964,9 +964,18 @@ static int wm0010_spi_probe(struct spi_device *spi)
                                     &soc_component_dev_wm0010, wm0010_dai,
                                     ARRAY_SIZE(wm0010_dai));
        if (ret < 0)
-               return ret;
+               goto disable_irq_wake;
 
        return 0;
+
+disable_irq_wake:
+       irq_set_irq_wake(wm0010->irq, 0);
+
+free_irq:
+       if (wm0010->irq)
+               free_irq(wm0010->irq, wm0010);
+
+       return ret;
 }
 
 static int wm0010_spi_remove(struct spi_device *spi)