From: trix@redhat.com
To: srinivas.kandagatla@linaro.org, bgoswami@codeaurora.org,
lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz,
tiwai@suse.com
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Tom Rix <trix@redhat.com>
Subject: [PATCH] ASoC: codecs: lpass-wsa-macro: make sure array index is set
Date: Thu, 29 Apr 2021 10:36:42 -0700 [thread overview]
Message-ID: <20210429173642.3230615-1-trix@redhat.com> (raw)
From: Tom Rix <trix@redhat.com>
Static analysis reports this problem
lpass-wsa-macro.c:1732:6: warning: Array subscript is undefined
if (wsa->ec_hq[ec_tx]) {
^~~~~~~~~~~~~~~~~
The happens because 'ec_tx' is never initialized and there is
no default in the switch statement that sets ec_tx. Because there
are only two cases for the switch, convert it to an if-else.
Signed-off-by: Tom Rix <trix@redhat.com>
---
sound/soc/codecs/lpass-wsa-macro.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
index 1a7fa5492f28..c11ae72f2148 100644
--- a/sound/soc/codecs/lpass-wsa-macro.c
+++ b/sound/soc/codecs/lpass-wsa-macro.c
@@ -1718,15 +1718,13 @@ static int wsa_macro_enable_echo(struct snd_soc_dapm_widget *w,
val = snd_soc_component_read(component, CDC_WSA_RX_INP_MUX_RX_MIX_CFG0);
- switch (w->shift) {
- case WSA_MACRO_EC0_MUX:
+ if (w->shift == WSA_MACRO_EC0_MUX) {
val = val & CDC_WSA_RX_MIX_TX0_SEL_MASK;
ec_tx = val - 1;
- break;
- case WSA_MACRO_EC1_MUX:
+ } else {
+ /* WSA_MACRO_EC1_MUX */
val = val & CDC_WSA_RX_MIX_TX1_SEL_MASK;
ec_tx = (val >> CDC_WSA_RX_MIX_TX1_SEL_SHFT) - 1;
- break;
}
if (wsa->ec_hq[ec_tx]) {
--
2.26.3
next reply other threads:[~2021-04-29 17:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 17:36 trix [this message]
2021-04-30 11:23 ` [PATCH] ASoC: codecs: lpass-wsa-macro: make sure array index is set Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210429173642.3230615-1-trix@redhat.com \
--to=trix@redhat.com \
--cc=alsa-devel@alsa-project.org \
--cc=bgoswami@codeaurora.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).