ASoC: SOF: topology: check errors when parsing LED tokens
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 11 Oct 2019 16:43:12 +0000 (11:43 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 14 Oct 2019 11:58:55 +0000 (12:58 +0100)
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>
Link: https://lore.kernel.org/r/20191011164312.7988-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/topology.c

index 3fad1d5cb2ca5df9f33f5ae65622e88cb34010c5..b3ab6f23fc930863de86b29cbe7cc8d84aa5cdda 100644 (file)
@@ -963,6 +963,11 @@ out:
        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);