diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2023-10-27 00:09:56 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-10-27 17:37:34 +0100 |
| commit | bd0f7498bc9084d8cccc5484cd004b40f314b763 (patch) | |
| tree | 204dfc53f8dd6c6d54876de5418914dbb0c4b242 /sound | |
| parent | a65cdffbef7bfdb9f55a3acb07ccf18d4f97b3a5 (diff) | |
ASoC: ams-delta.c: use component after check
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: d0fdfe34080c ("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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/ti/ams-delta.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c index b32cc03dc1c2..76bda188e992 100644 --- a/sound/soc/ti/ams-delta.c +++ b/sound/soc/ti/ams-delta.c @@ -301,7 +301,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); @@ -313,6 +313,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); |