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

Commit 1cb145c6 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Greg Kroah-Hartman
Browse files

ASoC: rsnd: avoid duplicate free_irq() 



commit e0936c3471a8411a5df327641fa3ffe12a2fb07b upstream.

commit 1f8754d4daea5f ("ASoC: rsnd: don't call free_irq() on
Parent SSI") fixed Parent SSI duplicate free_irq().
But on Renesas Sound, not only Parent SSI but also Multi SSI
have same issue.
This patch avoid duplicate free_irq() if it was not pure SSI.

Fixes: 1f8754d4daea5f ("ASoC: rsnd: don't call free_irq() on Parent SSI")
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarthongsyho <thong.ho.px@rvc.renesas.com>
Signed-off-by: default avatarNhan Nguyen <nhan.nguyen.yb@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24978c21

sound/soc/sh/rcar/ssi.c

+3 −3
Original line number Diff line number Diff line
@@ -699,12 +699,12 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod, 
			       struct rsnd_priv *priv)

{

	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);

	struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io);

	struct rsnd_mod *pure_ssi_mod = rsnd_io_to_mod_ssi(io);

	struct device *dev = rsnd_priv_to_dev(priv);

	int irq = ssi->irq;



	/* Do nothing for SSI parent mod */

	if (ssi_parent_mod == mod)

	/* Do nothing if non SSI (= SSI parent, multi SSI) mod */

	if (pure_ssi_mod != mod)

		return 0;



	/* PIO will request IRQ again */