On Sat 06 Jun 2020 at 17:31, Pavel Machek <[email protected]> wrote:

> free_irq() is missing in case of error, fix that.
>
> Signed-off-by: Pavel Machek (CIP) <[email protected]>

Reviewed-by: Jerome Brunet <[email protected]>

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

Reply via email to