ASoC: codecs: tx-macro: fix active_decimator array

currently active_decimator[] is unsigned long however we store negative
values when there is no decimator setup -1.

This is first bug, and the second bug is that we do not check if the decimator
is valid before writing to register using decimator as offset in
CDC_TXn_TX_PATH_CTL()

Fix these both by making active_decimator as integer array and adding check
in tx_macro_digital_mute() before accessing CDC_TXn_TX_PATH_CTL() register.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220906170112.1984-5-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c
index c19bb19..5c03ef8 100644 (file)
--- a/sound/soc/codecs/lpass-tx-macro.c
+++ b/sound/soc/codecs/lpass-tx-macro.c
@@ -259,7 +259,7 @@ struct tx_macro {
        struct tx_mute_work tx_mute_dwork[NUM_DECIMATORS];
        unsigned long active_ch_mask[TX_MACRO_MAX_DAIS];
        unsigned long active_ch_cnt[TX_MACRO_MAX_DAIS];
-       unsigned long active_decimator[TX_MACRO_MAX_DAIS];
+       int active_decimator[TX_MACRO_MAX_DAIS];
        struct regmap *regmap;
        struct clk *mclk;
        struct clk *npl;
@@ -1117,6 +1117,10 @@ static int tx_macro_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
        struct tx_macro *tx = snd_soc_component_get_drvdata(component);
        u16 decimator;
 
+       /* active decimator not set yet */
+       if (tx->active_decimator[dai->id] == -1)
+               return 0;
+
        decimator = tx->active_decimator[dai->id];
 
        if (mute)