From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAC4FC433B4 for ; Thu, 29 Apr 2021 17:36:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7557161400 for ; Thu, 29 Apr 2021 17:36:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240986AbhD2Rhh (ORCPT ); Thu, 29 Apr 2021 13:37:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22789 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240969AbhD2Rhg (ORCPT ); Thu, 29 Apr 2021 13:37:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619717809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=K4rNwoUrsBxVZzoadAn6uvb1lrOSv00d53aEi1UZj3U=; b=R84VLNkFqpM7GHnpj9QO9duzXPPB00Q7eRbdhyt8voO2oq4QT1/k1dv1Tg/t680aBOzIgV ApbXeCHCOW8LUCUmRJ7ur/HOCfkUM3yIoF8zE52+sCeo0msf60pWxMEvCxT6JgtQ7TaezK /tYs0bwJ6Drz2DpWofiLfMhcM+4bLAs= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-478-WQIzpuYHPtKcsVomKskp-w-1; Thu, 29 Apr 2021 13:36:47 -0400 X-MC-Unique: WQIzpuYHPtKcsVomKskp-w-1 Received: by mail-qk1-f198.google.com with SMTP id c4-20020a3781040000b02902e46e29acf5so11539031qkd.22 for ; Thu, 29 Apr 2021 10:36:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K4rNwoUrsBxVZzoadAn6uvb1lrOSv00d53aEi1UZj3U=; b=oEtjvcvcRwEmsip6n7yxGHZ5abHf5BNZx9WWy3wHjDIY6n57hW19YsLy0+B8+o76XK N7bzBEblQ/jlkneXrPXlNDkVL6+EQoe+QxpFCFrMhN4v8k0TWTC+cdDU5sYIiQJBOQQA wor5mbFa/+2+BdByQWBh/f3J/3DiwHSJxc+2v9jlG7+eRDMTnSPuMZl845M7nIVY8Aat /aryCXYX7hluhrP/N2dodeVpN9nnbuwuBTAjxHPcXdUInibPQVStmZh7+Uif3c1MNUV1 4n/XCtzgmpqUSQh4Sk2ALaOGs9MBdZ2GVLVixZRCM5pU3bIMYqv1YbzZn46Nw5iMVUJD k5sA== X-Gm-Message-State: AOAM532dGCOw9blnitB7W5ikrC09WqrqhDaUqb9GEUBXAcXs3kPE9xKY fbMNaZ2ISRyz06IZo0QKLjJOlxmTvptbfJMlEAPz46BX5pYjXc7OzvoDZDnsgcBs3cDSaN/FwJa vK2GOu4Fc3e0b78DHPiibF9In X-Received: by 2002:ad4:55ab:: with SMTP id f11mr621354qvx.49.1619717806933; Thu, 29 Apr 2021 10:36:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxm+KAbmVoVRhpdIdwacN/+bTi3+qtiMBy4JkP5iV66UBMlTFgUYy5K73549+vcQxt8ZOEYFg== X-Received: by 2002:ad4:55ab:: with SMTP id f11mr621331qvx.49.1619717806749; Thu, 29 Apr 2021 10:36:46 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id 144sm2725453qkn.108.2021.04.29.10.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Apr 2021 10:36:46 -0700 (PDT) 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 Subject: [PATCH] ASoC: codecs: lpass-wsa-macro: make sure array index is set Date: Thu, 29 Apr 2021 10:36:42 -0700 Message-Id: <20210429173642.3230615-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Rix 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 --- 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