ASoC: meson: add missing free_irq() in error path

[ Upstream commit 3b8a299a58b2afce464ae11324b59dcf0f1d10a7 ]

free_irq() is missing in case of error, fix that.

Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20200606153103.GA17905@amd
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c
index 0e4f65e654c4be38130a0e81add85142f06e9d6d..b229c182b7c3da9bb8be4d43f4456f7f6bdd0c3a 100644 (file)
--- a/sound/soc/meson/axg-fifo.c
+++ b/sound/soc/meson/axg-fifo.c
@@ -209,7 +209,7 @@ static int axg_fifo_pcm_open(struct snd_pcm_substream *ss)
        /* Enable pclk to access registers and clock the fifo ip */
        ret = clk_prepare_enable(fifo->pclk);
        if (ret)
-               return ret;
+               goto free_irq;
 
        /* Setup status2 so it reports the memory pointer */
        regmap_update_bits(fifo->map, FIFO_CTRL1,
@@ -229,8 +229,14 @@ static int axg_fifo_pcm_open(struct snd_pcm_substream *ss)
        /* Take memory arbitror out of reset */
        ret = reset_control_deassert(fifo->arb);
        if (ret)
-               clk_disable_unprepare(fifo->pclk);
+               goto free_clk;
+
+       return 0;
 
+free_clk:
+       clk_disable_unprepare(fifo->pclk);
+free_irq:
+       free_irq(fifo->irq, ss);
        return ret;
 }