Commit 51a630a7 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown

ASoC: simple-card-utils: Avoid NULL deref in asoc_simple_set_tdm()

Don't dereference simple_dai before it has been checked for NULL.
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Fixes: 1e974e5b ("ASoC: audio_graph_card2: Add support for variable slot widths")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20220404113252.1152659-1-rf@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 89bac792
...@@ -364,13 +364,15 @@ static int asoc_simple_set_tdm(struct snd_soc_dai *dai, ...@@ -364,13 +364,15 @@ static int asoc_simple_set_tdm(struct snd_soc_dai *dai,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
{ {
int sample_bits = params_width(params); int sample_bits = params_width(params);
int slot_width = simple_dai->slot_width; int slot_width, slot_count;
int slot_count = simple_dai->slots;
int i, ret; int i, ret;
if (!simple_dai || !simple_dai->tdm_width_map) if (!simple_dai || !simple_dai->tdm_width_map)
return 0; return 0;
slot_width = simple_dai->slot_width;
slot_count = simple_dai->slots;
if (slot_width == 0) if (slot_width == 0)
slot_width = sample_bits; slot_width = sample_bits;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment