summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPavel Machek (CIP) <pavel@denx.de>2020-06-06 17:31:03 +0200
committerMark Brown <broonie@kernel.org>2020-06-09 12:04:57 +0100
commit3b8a299a58b2afce464ae11324b59dcf0f1d10a7 (patch)
tree8454b36e2d912d75cef6f7e9b5d8078e8e583932 /sound
parent8a9144c1cf523221b37dd3393827253c91fcbf54 (diff)
downloadlwn-3b8a299a58b2afce464ae11324b59dcf0f1d10a7.tar.gz
lwn-3b8a299a58b2afce464ae11324b59dcf0f1d10a7.zip
ASoC: meson: add missing free_irq() in error path
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/meson/axg-fifo.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c
index 2e9b56b29d31..b2e867113226 100644
--- a/sound/soc/meson/axg-fifo.c
+++ b/sound/soc/meson/axg-fifo.c
@@ -249,7 +249,7 @@ int axg_fifo_pcm_open(struct snd_soc_component *component,
/* 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,
@@ -269,8 +269,14 @@ int axg_fifo_pcm_open(struct snd_soc_component *component,
/* 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;
}
EXPORT_SYMBOL_GPL(axg_fifo_pcm_open);