Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, broonie@kernel.org,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [alsa-devel] [PATCH 4/4] ASoC: SOF: topology: check errors when parsing LED tokens
Date: Fri, 11 Oct 2019 11:43:12 -0500
Message-ID: <20191011164312.7988-5-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20191011164312.7988-1-pierre-louis.bossart@linux.intel.com>

sof_parse_tokens() returns a value that is checked on every call
except for LED tokens, fix with explicit test.

Detected with cppcheck warning:

sound/soc/sof/topology.c:973:6: style: Variable 'ret' is assigned a
value that is never used. [unreadVariable]
 ret = sof_parse_tokens(scomp, &scontrol->led_ctl, led_tokens,
     ^

Fixes: 5d43001ae4360 ("ASoC: SOF: acpi led support for switch controls")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/sof/topology.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 05eec3c464a9..cc138ac6a8eb 100644
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -973,6 +973,11 @@ static int sof_control_load_volume(struct snd_soc_component *scomp,
 	ret = sof_parse_tokens(scomp, &scontrol->led_ctl, led_tokens,
 			       ARRAY_SIZE(led_tokens), mc->priv.array,
 			       le32_to_cpu(mc->priv.size));
+	if (ret != 0) {
+		dev_err(sdev->dev, "error: parse led tokens failed %d\n",
+			le32_to_cpu(mc->priv.size));
+		return ret;
+	}
 
 	dev_dbg(sdev->dev, "tplg: load kcontrol index %d chans %d\n",
 		scontrol->comp_id, scontrol->num_channels);
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  parent reply index

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-11 16:43 [alsa-devel] [PATCH 0/4] ASoC: SOF: fix static analysis warnings Pierre-Louis Bossart
2019-10-11 16:43 ` [alsa-devel] [PATCH 1/4] ASoC: SOF: Intel: byt: fix operator precedence warnings Pierre-Louis Bossart
2019-10-14 12:04   ` [alsa-devel] Applied "ASoC: SOF: Intel: byt: fix operator precedence warnings" to the asoc tree Mark Brown
2019-10-11 16:43 ` [alsa-devel] [PATCH 2/4] ASoC: SOF: Intel: bdw: fix operator precedence warnings Pierre-Louis Bossart
2019-10-14 12:04   ` [alsa-devel] Applied "ASoC: SOF: Intel: bdw: fix operator precedence warnings" to the asoc tree Mark Brown
2019-10-11 16:43 ` [alsa-devel] [PATCH 3/4] ASoC: SOF: topology: remove always-true redundant test Pierre-Louis Bossart
2019-10-14 12:04   ` [alsa-devel] Applied "ASoC: SOF: topology: remove always-true redundant test" to the asoc tree Mark Brown
2019-10-11 16:43 ` Pierre-Louis Bossart [this message]
2019-10-14 12:04   ` [alsa-devel] Applied "ASoC: SOF: topology: check errors when parsing LED tokens" " Mark Brown

Reply instructions:

You may reply publically 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=20191011164312.7988-5-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=tiwai@suse.de \
    /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

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git