[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1jeeu14gtf.fsf@starbuckisacylon.baylibre.com>
Date: Mon, 09 Mar 2020 17:46:20 +0100
From: Jerome Brunet <jbrunet@...libre.com>
To: Pavel Machek <pavel@....cz>, lgirdwood@...il.com,
broonie@...nel.org, perex@...ex.cz, tiwai@...e.com,
khilman@...libre.com, linux-amlogic@...ts.infradead.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] sound/soc/meson: fix irq leak in error path
On Mon 09 Mar 2020 at 17:29, Pavel Machek <pavel@....cz> wrote:
> Irq seems to be leaked in error path. Fix that.
>
Thanks for fixing this.
the Fixes tag is missing here.
Fixes: 6dc4fa179fb8 ("ASoC: meson: add axg fifo base driver")
> Signed-off-by: Pavel Machek <pavel@...x.de>
>
> ---
>
> I noticed problem during -stable review, and don't have hardware or
> ability to test the patch. Handle with care.
>
> diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c
> index 2f44e93359f6..fbac6de891cd 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,
> @@ -270,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:
This label is misleading as it won't free the clock but turn it off.
how about 'err_rst' ?
> + clk_disable_unprepare(fifo->pclk);
> +free_irq:
and 'err_pclk' here ?
> + free_irq(fifo->irq, ss);
> return ret;
> }
> EXPORT_SYMBOL_GPL(axg_fifo_pcm_open);
Powered by blists - more mailing lists