Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6fe402e authored by Pavel Machek (CIP)'s avatar Pavel Machek (CIP) Committed by Greg Kroah-Hartman
Browse files

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: default avatarPavel Machek (CIP) <pavel@denx.de>
Reviewed-by: default avatarJerome Brunet <jbrunet@baylibre.com>

Link: https://lore.kernel.org/r/20200606153103.GA17905@amd


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 70fa5992

sound/soc/meson/axg-fifo.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -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 */

	/* Enable pclk to access registers and clock the fifo ip */

	ret = clk_prepare_enable(fifo->pclk);

	ret = clk_prepare_enable(fifo->pclk);

	if (ret)

	if (ret)

		return ret;

		goto free_irq;





	/* Setup status2 so it reports the memory pointer */

	/* Setup status2 so it reports the memory pointer */

	regmap_update_bits(fifo->map, FIFO_CTRL1,

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

	/* Take memory arbitror out of reset */

	ret = reset_control_deassert(fifo->arb);

	ret = reset_control_deassert(fifo->arb);

	if (ret)

	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;

	return ret;

}

}