Commit b843d2cd authored Oct 27, 2023 by Kuninori Morimoto Committed by Greg Kroah-Hartman Nov 20, 2023

ASoC: ams-delta.c: use component after check



[ Upstream commit bd0f7498bc9084d8cccc5484cd004b40f314b763 ]

	static void cx81801_close()
	{
		...
(A)		struct snd_soc_dapm_context *dapm = &component->card->dapm;
		...
(B)		if (!component)
			return;
	}

(A) uses component before NULL check (B). This patch moves it after (B).

Fixes: d0fdfe34 ("ASoC: cx20442: replace codec to component")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/3e608474-e99a-4866-ae98-3054a4221f09@moroto.mountain


Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ttqdq623.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 4634c9cc

sound/soc/ti/ams-delta.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -303,7 +303,7 @@ static int cx81801_open(struct tty_struct *tty)
		static void cx81801_close(struct tty_struct *tty)
		{
		struct snd_soc_component *component = tty->disc_data;
		struct snd_soc_dapm_context *dapm = &component->card->dapm;
		struct snd_soc_dapm_context *dapm;

		del_timer_sync(&cx81801_timer);

		@@ -315,6 +315,8 @@ static void cx81801_close(struct tty_struct *tty)

		v253_ops.close(tty);

		dapm = &component->card->dapm;

		/* Revert back to default audio input/output constellation */
		snd_soc_dapm_mutex_lock(dapm);