lkml.org 
[lkml]   [2020]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] soc/meson: add missing free_irq() in error path
Date

On Sat 06 Jun 2020 at 17:31, Pavel Machek <pavel@ucw.cz> wrote:

> 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>

>
> 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);

\
 
 \ /
  Last update: 2020-06-07 22:43    [W:0.061 / U:0.820 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site