All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, vkoul@kernel.org, broonie@kernel.org,
	srinivas.kandagatla@linaro.org,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH 10/10] ASoC: lpass-wsa-macro: add missing test
Date: Thu, 18 Feb 2021 16:29:16 -0600	[thread overview]
Message-ID: <20210218222916.89809-11-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20210218222916.89809-1-pierre-louis.bossart@linux.intel.com>

cppcheck warning:

sound/soc/codecs/lpass-wsa-macro.c:958:6: style: Variable 'ret' is
reassigned a value before the old one has been
used. [redundantAssignment]
 ret = wsa_macro_set_prim_interpolator_rate(dai, (u8) rate_val, sample_rate);
     ^
sound/soc/codecs/lpass-wsa-macro.c:946:6: note: ret is assigned
 ret = wsa_macro_set_mix_interpolator_rate(dai, (u8) rate_val, sample_rate);
     ^
sound/soc/codecs/lpass-wsa-macro.c:958:6: note: ret is overwritten
 ret = wsa_macro_set_prim_interpolator_rate(dai, (u8) rate_val, sample_rate);
     ^

set_mix_interpolator_rate can return -EINVAL, add a test and bail on error.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/codecs/lpass-wsa-macro.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
index 5ebcd935ba89..0be5d25e2a29 100644
--- a/sound/soc/codecs/lpass-wsa-macro.c
+++ b/sound/soc/codecs/lpass-wsa-macro.c
@@ -944,6 +944,8 @@ static int wsa_macro_set_interpolator_rate(struct snd_soc_dai *dai,
 		goto prim_rate;
 
 	ret = wsa_macro_set_mix_interpolator_rate(dai, (u8) rate_val, sample_rate);
+	if (ret < 0)
+		return ret;
 prim_rate:
 	/* set primary path sample rate */
 	for (i = 0; i < ARRAY_SIZE(int_prim_sample_rate_val); i++) {
-- 
2.25.1


  parent reply	other threads:[~2021-02-18 22:34 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-18 22:29 [PATCH 00/10] ASoC: qcom: remove cppcheck warnings Pierre-Louis Bossart
2021-02-18 22:29 ` [PATCH 01/10] ASoC: qcom: lpass-hdmi: remove useless return Pierre-Louis Bossart
2021-02-18 22:29 ` [PATCH 02/10] ASoC: qcom: lpass-platform: remove useless assignment Pierre-Louis Bossart
2021-02-18 22:29 ` [PATCH 03/10] ASoC: qcom: q6dsp-dai: clarify expression Pierre-Louis Bossart
2021-02-18 22:29 ` [PATCH 04/10] ASoC: qcom: q6afe: remove useless assignments Pierre-Louis Bossart
2021-02-18 22:29 ` [PATCH 05/10] ASoC: qcom: q6afe: align function prototype Pierre-Louis Bossart
2021-02-18 22:29 ` [PATCH 06/10] ASoC: qcom: q6asm: align function prototypes Pierre-Louis Bossart
2021-02-18 22:29 ` [PATCH 07/10] ASoC: wcd-clsh-v2: " Pierre-Louis Bossart
2021-02-18 22:29 ` [PATCH 08/10] ASoC: wcd9335: clarify return value Pierre-Louis Bossart
2021-02-18 22:29 ` [PATCH 09/10] ASoC: wcd934x: remove useless return Pierre-Louis Bossart
2021-02-18 22:29 ` Pierre-Louis Bossart [this message]
2021-02-19 10:32 ` [PATCH 00/10] ASoC: qcom: remove cppcheck warnings Srinivas Kandagatla
2021-03-01 23:34 ` 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=20210218222916.89809-11-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=tiwai@suse.de \
    --cc=vkoul@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.