diff options
author | Mark Brown <broonie@kernel.org> | 2023-06-16 14:55:20 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-06-16 14:55:20 +0100 |
commit | 1a32b4b9a6229233de70cec28fb5a87fabac2c41 (patch) | |
tree | 773f8a5c40ac3176d2a0613c51fc4cd333b1bcc2 /sound/soc/codecs/lpass-tx-macro.c | |
parent | 928314eb06709e3861ce3e2c7e9ef3f83ba8691b (diff) | |
parent | f9fd804aa0a36f15a35ca070ec4c52650876cc29 (diff) |
ASoC: Merge fixes due to dependencies
So we can apply the tlv320aic3xxx DT conversion.
Diffstat (limited to 'sound/soc/codecs/lpass-tx-macro.c')
-rw-r--r-- | sound/soc/codecs/lpass-tx-macro.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index da6fcf7f0991..de978c3d70b7 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -746,6 +746,8 @@ static int tx_macro_put_dec_enum(struct snd_kcontrol *kcontrol, struct tx_macro *tx = snd_soc_component_get_drvdata(component); val = ucontrol->value.enumerated.item[0]; + if (val >= e->items) + return -EINVAL; switch (e->reg) { case CDC_TX_INP_MUX_ADC_MUX0_CFG0: @@ -772,6 +774,9 @@ static int tx_macro_put_dec_enum(struct snd_kcontrol *kcontrol, case CDC_TX_INP_MUX_ADC_MUX7_CFG0: mic_sel_reg = CDC_TX7_TX_PATH_CFG0; break; + default: + dev_err(component->dev, "Error in configuration!!\n"); + return -EINVAL; } if (val != 0) { |